mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-24 03:37:16 +00:00
release: arm: Use BOARDNAME in the image name
Using KERNEL made sense when all boards had different kernel configuration. Now that all of them are using GENERIC use the board name instead Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D16512
This commit is contained in:
parent
2e81004069
commit
3d62046d67
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336994
|
@ -392,7 +392,7 @@ chroot_arm_build_release() {
|
|||
export WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)"
|
||||
export OBJDIR="$(eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)"
|
||||
export DESTDIR="${OBJDIR}/${KERNEL}"
|
||||
export IMGBASE="${CHROOTDIR}/${OBJDIR}/${KERNEL}.img"
|
||||
export IMGBASE="${CHROOTDIR}/${OBJDIR}/${BOARDNAME}.img"
|
||||
export OSRELEASE="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release \
|
||||
TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
|
||||
-V OSRELEASE)"
|
||||
|
@ -406,11 +406,11 @@ chroot_arm_build_release() {
|
|||
arm_install_uboot
|
||||
mdconfig -d -u ${mddev}
|
||||
chroot ${CHROOTDIR} rmdir ${DESTDIR}
|
||||
mv ${IMGBASE} ${CHROOTDIR}/${OBJDIR}/${OSRELEASE}-${KERNEL}.img
|
||||
mv ${IMGBASE} ${CHROOTDIR}/${OBJDIR}/${OSRELEASE}-${BOARDNAME}.img
|
||||
chroot ${CHROOTDIR} mkdir -p /R
|
||||
chroot ${CHROOTDIR} cp -p ${OBJDIR}/${OSRELEASE}-${KERNEL}.img \
|
||||
/R/${OSRELEASE}-${KERNEL}.img
|
||||
chroot ${CHROOTDIR} xz -T ${XZ_THREADS} /R/${OSRELEASE}-${KERNEL}.img
|
||||
chroot ${CHROOTDIR} cp -p ${OBJDIR}/${OSRELEASE}-${BOARDNAME}.img \
|
||||
/R/${OSRELEASE}-${BOARDNAME}.img
|
||||
chroot ${CHROOTDIR} xz -T ${XZ_THREADS} /R/${OSRELEASE}-${BOARDNAME}.img
|
||||
cd ${CHROOTDIR}/R && sha512 ${OSRELEASE}* \
|
||||
> CHECKSUM.SHA512
|
||||
cd ${CHROOTDIR}/R && sha256 ${OSRELEASE}* \
|
||||
|
|
Loading…
Reference in a new issue