Merge the following from ^/projects/release-noxdev:
r269549, r269551, r269552, r269553, r269554, r269555, r269558, r269559,
r269560, r269561, r269628, r269629, r269630, r269635, r269637:
r269549:
Create a new project branch, release-noxdev, for
a sandbox workspace outside of head/ to update the
release bits for arm builds since the deprecation of
the XDEV and XDEV_ARCH make(1) variables.
r269551:
Define load_chroot_env() and load_target_env()
prototypes.
r269552:
Call load_chroot_env() and load_target_env() where
they can be mutually conflicting with regard to
TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH.
r269553:
Add shebang line to arm/*.conf files since these
should be considered to be executable (albeit not
on their own) shell scripts.
r269554:
Redefine load_chroot_env() and load_target_env() in
the arm/*.conf files, and reindent.
r269555:
Simplify where load_chroot_env() and load_target_env() are
called.
r269558:
Provide example in release.conf.sample for overriding the
load_chroot_env() and load_target_env() prototypes.
r269559:
Remove a gratuitous newline.
r269560:
Unset potentially conflicting variables in load_chroot_env()
and load_target_env().
r269561:
Make global variables global, and accessible outside of
the functions within which they were once defined.
r269628:
Remove XDEV/XDEV_ARCH evaluation if EMBEDDEDBUILD is set.
r269629:
In arm/release.sh, switch TARGET/TARGET_ARCH back to the
original XDEV/XDEV_ARCH make(1) variables.
In theory, this should have been a no-op, but the TARGET and
TARGET_ARCH are now unset in load_target_env() to avoid
collision with the chroot userland.
r269630:
Export variables in the arm/*.conf files because they
need to be passed through release.sh to arm/release.sh.
Set MK_TESTS=no for the xdev target.
r269635:
As part of the XDEV/XDEV_ARCH deprecation, the
'xdev-links' target was intentionally no longer
invoked automatically.
Invoke the xdev-links target after xdev, which
creates, for example, /usr/bin/armv6-freebsd-cc
symlink to /usr/armv6-freebsd/usr/bin/cc.
r269637:
Set TARGET and TARGET_ARCH to the XDEV and XDEV_ARCH
counterparts for the xdev and xdev-links make(1)
targets.
Sponsored by: The FreeBSD Foundation
2014-08-06 19:04:05 +00:00
|
|
|
#!/bin/sh
|
2013-12-28 02:27:06 +00:00
|
|
|
#
|
|
|
|
# $FreeBSD$
|
|
|
|
#
|
|
|
|
|
2015-05-06 15:58:21 +00:00
|
|
|
EMBEDDEDBUILD=1
|
|
|
|
EMBEDDED_TARGET="arm"
|
|
|
|
EMBEDDED_TARGET_ARCH="armv6"
|
|
|
|
EMBEDDEDPORTS="sysutils/u-boot-rpi"
|
|
|
|
KERNEL="RPI-B"
|
2015-05-07 18:47:59 +00:00
|
|
|
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
|
2015-06-18 10:26:27 +00:00
|
|
|
IMAGE_SIZE="1G"
|
2015-05-07 18:47:59 +00:00
|
|
|
PART_SCHEME="MBR"
|
|
|
|
FAT_SIZE="17m"
|
|
|
|
FAT_TYPE="16"
|
|
|
|
MD_ARGS="-x 63 -y 255"
|
2015-05-07 18:48:47 +00:00
|
|
|
NODOC=1
|
Merge the following from ^/projects/release-noxdev:
r269549, r269551, r269552, r269553, r269554, r269555, r269558, r269559,
r269560, r269561, r269628, r269629, r269630, r269635, r269637:
r269549:
Create a new project branch, release-noxdev, for
a sandbox workspace outside of head/ to update the
release bits for arm builds since the deprecation of
the XDEV and XDEV_ARCH make(1) variables.
r269551:
Define load_chroot_env() and load_target_env()
prototypes.
r269552:
Call load_chroot_env() and load_target_env() where
they can be mutually conflicting with regard to
TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH.
r269553:
Add shebang line to arm/*.conf files since these
should be considered to be executable (albeit not
on their own) shell scripts.
r269554:
Redefine load_chroot_env() and load_target_env() in
the arm/*.conf files, and reindent.
r269555:
Simplify where load_chroot_env() and load_target_env() are
called.
r269558:
Provide example in release.conf.sample for overriding the
load_chroot_env() and load_target_env() prototypes.
r269559:
Remove a gratuitous newline.
r269560:
Unset potentially conflicting variables in load_chroot_env()
and load_target_env().
r269561:
Make global variables global, and accessible outside of
the functions within which they were once defined.
r269628:
Remove XDEV/XDEV_ARCH evaluation if EMBEDDEDBUILD is set.
r269629:
In arm/release.sh, switch TARGET/TARGET_ARCH back to the
original XDEV/XDEV_ARCH make(1) variables.
In theory, this should have been a no-op, but the TARGET and
TARGET_ARCH are now unset in load_target_env() to avoid
collision with the chroot userland.
r269630:
Export variables in the arm/*.conf files because they
need to be passed through release.sh to arm/release.sh.
Set MK_TESTS=no for the xdev target.
r269635:
As part of the XDEV/XDEV_ARCH deprecation, the
'xdev-links' target was intentionally no longer
invoked automatically.
Invoke the xdev-links target after xdev, which
creates, for example, /usr/bin/armv6-freebsd-cc
symlink to /usr/armv6-freebsd/usr/bin/cc.
r269637:
Set TARGET and TARGET_ARCH to the XDEV and XDEV_ARCH
counterparts for the xdev and xdev-links make(1)
targets.
Sponsored by: The FreeBSD Foundation
2014-08-06 19:04:05 +00:00
|
|
|
|
2015-05-07 18:47:59 +00:00
|
|
|
arm_install_uboot() {
|
2015-05-09 21:08:12 +00:00
|
|
|
UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
|
2015-05-07 18:47:59 +00:00
|
|
|
UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
|
2015-05-07 20:02:50 +00:00
|
|
|
start.elf start_cd.elf u-boot.img"
|
2015-05-09 21:08:12 +00:00
|
|
|
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
|
|
|
|
UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
|
2015-05-07 19:10:08 +00:00
|
|
|
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
|
2015-05-07 18:47:59 +00:00
|
|
|
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
|
|
|
|
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
|
|
|
|
for _UF in ${UBOOT_FILES}; do
|
2015-05-09 21:08:12 +00:00
|
|
|
chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
|
|
|
|
${FATMOUNT}/${_UF}
|
2015-05-07 18:47:59 +00:00
|
|
|
done
|
2015-05-09 21:08:12 +00:00
|
|
|
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
|
|
|
|
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \
|
|
|
|
${FATMOUNT}/rpi.dtb
|
|
|
|
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
|
2015-05-07 18:47:59 +00:00
|
|
|
sync
|
|
|
|
umount_loop ${CHROOTDIR}/${FATMOUNT}
|
|
|
|
umount_loop ${CHROOTDIR}/${UFSMOUNT}
|
2015-05-09 21:08:12 +00:00
|
|
|
chroot ${CHROOTDIR} rmdir ${FATMOUNT}
|
|
|
|
chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
|
2015-05-07 18:47:59 +00:00
|
|
|
|
|
|
|
return 0
|
Merge the following from ^/projects/release-noxdev:
r269549, r269551, r269552, r269553, r269554, r269555, r269558, r269559,
r269560, r269561, r269628, r269629, r269630, r269635, r269637:
r269549:
Create a new project branch, release-noxdev, for
a sandbox workspace outside of head/ to update the
release bits for arm builds since the deprecation of
the XDEV and XDEV_ARCH make(1) variables.
r269551:
Define load_chroot_env() and load_target_env()
prototypes.
r269552:
Call load_chroot_env() and load_target_env() where
they can be mutually conflicting with regard to
TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH.
r269553:
Add shebang line to arm/*.conf files since these
should be considered to be executable (albeit not
on their own) shell scripts.
r269554:
Redefine load_chroot_env() and load_target_env() in
the arm/*.conf files, and reindent.
r269555:
Simplify where load_chroot_env() and load_target_env() are
called.
r269558:
Provide example in release.conf.sample for overriding the
load_chroot_env() and load_target_env() prototypes.
r269559:
Remove a gratuitous newline.
r269560:
Unset potentially conflicting variables in load_chroot_env()
and load_target_env().
r269561:
Make global variables global, and accessible outside of
the functions within which they were once defined.
r269628:
Remove XDEV/XDEV_ARCH evaluation if EMBEDDEDBUILD is set.
r269629:
In arm/release.sh, switch TARGET/TARGET_ARCH back to the
original XDEV/XDEV_ARCH make(1) variables.
In theory, this should have been a no-op, but the TARGET and
TARGET_ARCH are now unset in load_target_env() to avoid
collision with the chroot userland.
r269630:
Export variables in the arm/*.conf files because they
need to be passed through release.sh to arm/release.sh.
Set MK_TESTS=no for the xdev target.
r269635:
As part of the XDEV/XDEV_ARCH deprecation, the
'xdev-links' target was intentionally no longer
invoked automatically.
Invoke the xdev-links target after xdev, which
creates, for example, /usr/bin/armv6-freebsd-cc
symlink to /usr/armv6-freebsd/usr/bin/cc.
r269637:
Set TARGET and TARGET_ARCH to the XDEV and XDEV_ARCH
counterparts for the xdev and xdev-links make(1)
targets.
Sponsored by: The FreeBSD Foundation
2014-08-06 19:04:05 +00:00
|
|
|
}
|