In release.sh, create the /dev directory within the chroot

before attempting to mount(8) devfs.  Also, create the
.OBJDIR for the 'release' target, so files end up in the
correct location.

In tools/arm.subr, fix the target device when creating the
gpart partition scheme.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-05-07 00:27:28 +00:00
parent 68bca5fb30
commit befaadd56c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/projects/release-arm-redux/; revision=282573
2 changed files with 4 additions and 2 deletions

View file

@ -243,6 +243,7 @@ chroot_setup() {
# extra_chroot_setup(): Prepare anything additional within the build
# necessary for the release build.
extra_chroot_setup() {
mkdir -p ${CHROOTDIR}/dev
mount -t devfs devfs ${CHROOTDIR}/dev
[ -e /etc/resolv.conf ] && cp /etc/resolv.conf \
${CHROOTDIR}/etc/resolv.conf
@ -323,6 +324,7 @@ chroot_build_release() {
# chroot_arm_armv6_build_release(): Create arm/armv6 SD card image.
chroot_arm_armv6_build_release() {
load_target_env
eval chroot ${CHROOTDIR} make -C /usr/src/release obj
# XXX: In progress.
if [ -e "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr" ]; then
. "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr"

View file

@ -64,8 +64,8 @@ umount_loop() {
arm_create_disk() {
# Create the target raw file and temporary work directory.
gpart create -s ${PART_SCHEME} ${IMGBASE}
gpart add -t '\!12' -a 63 -s ${FAT_SIZE} ${mddev}
gpart create -s ${PART_SCHEME} ${mddev}
gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev}
gpart set -a active -i 1 ${mddev}
newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1
gpart add -t freebsd ${mddev}