svn commit: r282662 - in projects/release-arm-redux/release: . arm
Glen Barber
gjb at FreeBSD.org
Fri May 8 20:02:42 UTC 2015
Author: gjb
Date: Fri May 8 20:02:40 2015
New Revision: 282662
URL: https://svnweb.freebsd.org/changeset/base/282662
Log:
Consistently chroot(8) where possible.
There should be no functional changes.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-arm-redux/release/arm/BEAGLEBONE.conf
projects/release-arm-redux/release/arm/PANDABOARD.conf
projects/release-arm-redux/release/arm/RPI-B.conf
projects/release-arm-redux/release/arm/RPI2.conf
projects/release-arm-redux/release/arm/WANDBOARD.conf
projects/release-arm-redux/release/release.sh
Modified: projects/release-arm-redux/release/arm/BEAGLEBONE.conf
==============================================================================
--- projects/release-arm-redux/release/arm/BEAGLEBONE.conf Fri May 8 19:43:53 2015 (r282661)
+++ projects/release-arm-redux/release/arm/BEAGLEBONE.conf Fri May 8 20:02:40 2015 (r282662)
@@ -17,22 +17,21 @@ MD_ARGS="-x 63 -y 255"
NODOC=1
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
+ UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
FATMOUNT="${DESTDIR##${KERNEL}}/fat"
UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
- cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
- cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
Modified: projects/release-arm-redux/release/arm/PANDABOARD.conf
==============================================================================
--- projects/release-arm-redux/release/arm/PANDABOARD.conf Fri May 8 19:43:53 2015 (r282661)
+++ projects/release-arm-redux/release/arm/PANDABOARD.conf Fri May 8 20:02:40 2015 (r282662)
@@ -17,22 +17,21 @@ FAT_TYPE="12"
MD_ARGS="-x 63 -y 255"
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-pandaboard"
+ UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard"
FATMOUNT="${DESTDIR##${KERNEL}}/fat"
UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
- cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
- cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
Modified: projects/release-arm-redux/release/arm/RPI-B.conf
==============================================================================
--- projects/release-arm-redux/release/arm/RPI-B.conf Fri May 8 19:43:53 2015 (r282661)
+++ projects/release-arm-redux/release/arm/RPI-B.conf Fri May 8 20:02:40 2015 (r282662)
@@ -17,7 +17,7 @@ MD_ARGS="-x 63 -y 255"
NODOC=1
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi"
+ UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
start.elf start_cd.elf u-boot.img"
FATMOUNT="${DESTDIR##${KERNEL}}/fat"
@@ -26,18 +26,18 @@ arm_install_uboot() {
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
for _UF in ${UBOOT_FILES}; do
- cp -p ${UBOOT_DIR}/${_UF} ${CHROOTDIR}/${FATMOUNT}/${_UF}
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
+ ${FATMOUNT}/${_UF}
done
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi.dtb \
- ${CHROOTDIR}/${FATMOUNT}/rpi.dtb
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ 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
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
Modified: projects/release-arm-redux/release/arm/RPI2.conf
==============================================================================
--- projects/release-arm-redux/release/arm/RPI2.conf Fri May 8 19:43:53 2015 (r282661)
+++ projects/release-arm-redux/release/arm/RPI2.conf Fri May 8 20:02:40 2015 (r282662)
@@ -17,7 +17,7 @@ FAT_TYPE="16"
MD_ARGS="-x 63 -y 255"
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi2"
+ UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin"
FATMOUNT="${DESTDIR##${KERNEL}}/fat"
@@ -26,18 +26,18 @@ arm_install_uboot() {
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
for _UF in ${UBOOT_FILES}; do
- cp -p ${UBOOT_DIR}/${_UF} ${CHROOTDIR}/${FATMOUNT}/${_UF}
+ chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
+ ${FATMOUNT}/${_UF}
done
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi2.dtb \
- ${CHROOTDIR}/${FATMOUNT}/rpi2.dtb
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \
+ ${FATMOUNT}/rpi2.dtb
+ chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
Modified: projects/release-arm-redux/release/arm/WANDBOARD.conf
==============================================================================
--- projects/release-arm-redux/release/arm/WANDBOARD.conf Fri May 8 19:43:53 2015 (r282661)
+++ projects/release-arm-redux/release/arm/WANDBOARD.conf Fri May 8 20:02:40 2015 (r282662)
@@ -17,26 +17,25 @@ MD_ARGS="-x 63 -y 255"
NODOC=1
arm_install_uboot() {
- UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
+ UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"
UBOOT_FILES="u-boot.imx"
FATMOUNT="${DESTDIR##${KERNEL}}/fat"
UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
of=/dev/${mddev} bs=512 seek=2
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
- cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
- ${CHROOTDIR}/${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
chroot ${CHROOTDIR} echo \
'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
> ${FATMOUNT}/boot.txt
- touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+ chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
umount_loop ${CHROOTDIR}/${UFSMOUNT}
- rmdir ${CHROOTDIR}/${FATMOUNT}
- rmdir ${CHROOTDIR}/${UFSMOUNT}
+ chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+ chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
return 0
}
Modified: projects/release-arm-redux/release/release.sh
==============================================================================
--- projects/release-arm-redux/release/release.sh Fri May 8 19:43:53 2015 (r282661)
+++ projects/release-arm-redux/release/release.sh Fri May 8 20:02:40 2015 (r282662)
@@ -336,14 +336,15 @@ chroot_arm_armv6_build_release() {
OSRELEASE="$(eval chroot ${CHROOTDIR} make -C /usr/src/release \
TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
-V OSRELEASE)"
- mkdir -p ${CHROOTDIR}/${DESTDIR}
- truncate -s ${IMAGE_SIZE} ${IMGBASE}
- export mddev=$(mdconfig -f ${IMGBASE} ${MD_ARGS})
+ chroot ${CHROOTDIR} mkdir -p ${DESTDIR}
+ chroot ${CHROOTDIR} truncate -s ${IMAGE_SIZE} ${IMGBASE##${CHROOTDIR}}
+ export mddev=$(chroot ${CHROOTDIR} \
+ mdconfig -f ${IMGBASE##${CHROOTDIR}} ${MD_ARGS})
arm_create_disk
arm_install_base
arm_install_uboot
mdconfig -d -u ${mddev}
- rmdir ${CHROOTDIR}/${DESTDIR}
+ chroot ${CHROOTDIR} rmdir ${DESTDIR}
mv ${IMGBASE} ${CHROOTDIR}/${OBJDIR}/${OSRELEASE}-${KERNEL}.img
chroot ${CHROOTDIR} mkdir -p /R
chroot ${CHROOTDIR} cp -p ${OBJDIR}/${OSRELEASE}-${KERNEL}.img \
More information about the svn-src-projects
mailing list