build: write nano like serial, refactor LABEL handling
This commit is contained in:
parent
a7860ec944
commit
b721d322ab
|
@ -191,7 +191,6 @@ fi
|
||||||
export CPUS=$(sysctl kern.smp.cpus | awk '{ print $2 }')
|
export CPUS=$(sysctl kern.smp.cpus | awk '{ print $2 }')
|
||||||
export CONFIG_XML="/usr/local/etc/config.xml"
|
export CONFIG_XML="/usr/local/etc/config.xml"
|
||||||
export ABI_FILE="/usr/lib/crt1.o"
|
export ABI_FILE="/usr/lib/crt1.o"
|
||||||
export LABEL=${PRODUCT_NAME}
|
|
||||||
export ENV_FILTER="env -i USER=${USER} LOGNAME=${LOGNAME} HOME=${HOME} \
|
export ENV_FILTER="env -i USER=${USER} LOGNAME=${LOGNAME} HOME=${HOME} \
|
||||||
SHELL=${SHELL} BLOCKSIZE=${BLOCKSIZE} MAIL=${MAIL} PATH=${PATH} \
|
SHELL=${SHELL} BLOCKSIZE=${BLOCKSIZE} MAIL=${MAIL} PATH=${PATH} \
|
||||||
TERM=${TERM} HOSTTYPE=${HOSTTYPE} VENDOR=${VENDOR} OSTYPE=${OSTYPE} \
|
TERM=${TERM} HOSTTYPE=${HOSTTYPE} VENDOR=${VENDOR} OSTYPE=${OSTYPE} \
|
||||||
|
|
13
build/dvd.sh
13
build/dvd.sh
|
@ -33,10 +33,8 @@ SELF=dvd
|
||||||
|
|
||||||
check_image ${SELF} ${@}
|
check_image ${SELF} ${@}
|
||||||
|
|
||||||
DVD="${IMAGESDIR}/${PRODUCT_RELEASE}-dvd-${PRODUCT_ARCH}.iso"
|
DVDIMAGE="${IMAGESDIR}/${PRODUCT_RELEASE}-dvd-${PRODUCT_ARCH}.iso"
|
||||||
|
DVDLABEL=$(echo "${PRODUCT_NAME}_Install" | tr '[:lower:]' '[:upper:]')
|
||||||
# rewrite the disk label, because we're install media
|
|
||||||
LABEL="${LABEL}_Install"
|
|
||||||
|
|
||||||
sh ./clean.sh ${SELF}
|
sh ./clean.sh ${SELF}
|
||||||
|
|
||||||
|
@ -48,9 +46,6 @@ setup_extras ${STAGEDIR}/work ${SELF}
|
||||||
setup_mtree ${STAGEDIR}/work
|
setup_mtree ${STAGEDIR}/work
|
||||||
setup_entropy ${STAGEDIR}/work
|
setup_entropy ${STAGEDIR}/work
|
||||||
|
|
||||||
# must be upper case:
|
|
||||||
LABEL=$(echo ${LABEL} | tr '[:lower:]' '[:upper:]')
|
|
||||||
|
|
||||||
UEFIBOOT=
|
UEFIBOOT=
|
||||||
if [ ${PRODUCT_ARCH} = "amd64" -a -n "${PRODUCT_UEFI}" ]; then
|
if [ ${PRODUCT_ARCH} = "amd64" -a -n "${PRODUCT_UEFI}" ]; then
|
||||||
dd if=/dev/zero of=${STAGEDIR}/efiboot.img bs=4k count=200
|
dd if=/dev/zero of=${STAGEDIR}/efiboot.img bs=4k count=200
|
||||||
|
@ -71,12 +66,12 @@ echo -n ">>> Building dvd image... "
|
||||||
|
|
||||||
cat > ${STAGEDIR}/work/etc/fstab << EOF
|
cat > ${STAGEDIR}/work/etc/fstab << EOF
|
||||||
# Device Mountpoint FStype Options Dump Pass #
|
# Device Mountpoint FStype Options Dump Pass #
|
||||||
/dev/iso9660/${LABEL} / cd9660 ro 0 0
|
/dev/iso9660/${DVDLABEL} / cd9660 ro 0 0
|
||||||
tmpfs /tmp tmpfs rw,mode=01777 0 0
|
tmpfs /tmp tmpfs rw,mode=01777 0 0
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
makefs -t cd9660 ${UEFIBOOT} \
|
makefs -t cd9660 ${UEFIBOOT} \
|
||||||
-o 'bootimage=i386;'"${STAGEDIR}"'/work/boot/cdboot' -o no-emul-boot \
|
-o 'bootimage=i386;'"${STAGEDIR}"'/work/boot/cdboot' -o no-emul-boot \
|
||||||
-o label=${LABEL} -o rockridge ${DVD} ${STAGEDIR}/work
|
-o label=${DVDLABEL} -o rockridge ${DVDIMAGE} ${STAGEDIR}/work
|
||||||
|
|
||||||
echo "done"
|
echo "done"
|
||||||
|
|
|
@ -41,39 +41,28 @@ if [ -n "${1}" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
NANOIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-nano-${PRODUCT_ARCH}.img"
|
NANOIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-nano-${PRODUCT_ARCH}.img"
|
||||||
NANOBASE="${STAGEDIR}/nanobase"
|
NANOSIZE=$(echo ${NANOSIZE} | tr '[:upper:]' '[:lower:]')
|
||||||
|
NANOLABEL="${PRODUCT_NAME}_Nano"
|
||||||
|
|
||||||
sh ./clean.sh ${SELF}
|
sh ./clean.sh ${SELF}
|
||||||
|
|
||||||
setup_stage ${STAGEDIR} mnt
|
setup_stage ${STAGEDIR}
|
||||||
|
setup_base ${STAGEDIR}
|
||||||
|
setup_kernel ${STAGEDIR}
|
||||||
|
setup_packages ${STAGEDIR}
|
||||||
|
setup_extras ${STAGEDIR} ${SELF}
|
||||||
|
setup_entropy ${STAGEDIR}
|
||||||
|
|
||||||
truncate -s ${NANOSIZE} ${NANOBASE}
|
cat > ${STAGEDIR}/etc/fstab << EOF
|
||||||
MD=$(mdconfig -f ${NANOBASE})
|
# Device Mountpoint FStype Options Dump Pass#
|
||||||
newfs /dev/${MD}
|
/dev/ufs/${NANOLABEL} / ufs rw 1 1
|
||||||
tunefs -L ${LABEL} /dev/${MD}
|
|
||||||
mount /dev/${MD} ${STAGEDIR}/mnt
|
|
||||||
|
|
||||||
setup_base ${STAGEDIR}/mnt
|
|
||||||
|
|
||||||
# need these again later
|
|
||||||
cp -r ${STAGEDIR}/mnt/boot ${STAGEDIR}
|
|
||||||
|
|
||||||
setup_kernel ${STAGEDIR}/mnt
|
|
||||||
setup_packages ${STAGEDIR}/mnt
|
|
||||||
setup_extras ${STAGEDIR}/mnt ${SELF}
|
|
||||||
setup_entropy ${STAGEDIR}/mnt
|
|
||||||
|
|
||||||
cat > ${STAGEDIR}/mnt/etc/fstab << EOF
|
|
||||||
/dev/ufs/${LABEL} / ufs rw,async,noatime 1 1
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
umount ${STAGEDIR}/mnt
|
makefs -t ffs -s ${NANOSIZE} -B little \
|
||||||
mdconfig -d -u ${MD}
|
-o label=${NANOLABEL} ${NANOIMG} ${STAGEDIR}
|
||||||
|
|
||||||
echo -n ">>> Building nano image... "
|
DEV=$(mdconfig -a -t vnode -f "${NANOIMG}" -x 63 -y 255)
|
||||||
|
gpart create -s BSD "${DEV}"
|
||||||
mkimg -s bsd -o ${NANOIMG} \
|
gpart bootcode -b "${STAGEDIR}"/boot/boot "${DEV}"
|
||||||
-b ${STAGEDIR}/boot/boot \
|
gpart add -t freebsd-ufs "${DEV}"
|
||||||
-p freebsd-ufs:=${NANOBASE}
|
mdconfig -d -u "${DEV}"
|
||||||
|
|
||||||
echo "done"
|
|
||||||
|
|
|
@ -35,9 +35,7 @@ SELF=serial
|
||||||
check_image ${SELF} ${@}
|
check_image ${SELF} ${@}
|
||||||
|
|
||||||
SERIALIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-serial-${PRODUCT_ARCH}.img"
|
SERIALIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-serial-${PRODUCT_ARCH}.img"
|
||||||
|
SERIALLABEL="${PRODUCT_NAME}_Install"
|
||||||
# rewrite the disk label, because we're install media
|
|
||||||
LABEL="${LABEL}_Install"
|
|
||||||
|
|
||||||
sh ./clean.sh ${SELF}
|
sh ./clean.sh ${SELF}
|
||||||
|
|
||||||
|
@ -51,11 +49,11 @@ setup_entropy ${STAGEDIR}
|
||||||
|
|
||||||
cat > ${STAGEDIR}/etc/fstab << EOF
|
cat > ${STAGEDIR}/etc/fstab << EOF
|
||||||
# Device Mountpoint FStype Options Dump Pass#
|
# Device Mountpoint FStype Options Dump Pass#
|
||||||
/dev/ufs/${LABEL} / ufs ro,noatime 1 1
|
/dev/ufs/${SERIALLABEL} / ufs ro,noatime 1 1
|
||||||
tmpfs /tmp tmpfs rw,mode=01777 0 0
|
tmpfs /tmp tmpfs rw,mode=01777 0 0
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
makefs -t ffs -B little -o label=${LABEL} ${SERIALIMG} ${STAGEDIR}
|
makefs -t ffs -B little -o label=${SERIALLABEL} ${SERIALIMG} ${STAGEDIR}
|
||||||
|
|
||||||
DEV=$(mdconfig -a -t vnode -f "${SERIALIMG}")
|
DEV=$(mdconfig -a -t vnode -f "${SERIALIMG}")
|
||||||
gpart create -s BSD "${DEV}"
|
gpart create -s BSD "${DEV}"
|
||||||
|
|
|
@ -34,9 +34,7 @@ SELF=vga
|
||||||
check_image ${SELF} ${@}
|
check_image ${SELF} ${@}
|
||||||
|
|
||||||
VGAIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-vga-${PRODUCT_ARCH}.img"
|
VGAIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-vga-${PRODUCT_ARCH}.img"
|
||||||
|
VGALABEL="${PRODUCT_NAME}_Install"
|
||||||
# rewrite the disk label, because we're install media
|
|
||||||
LABEL="${LABEL}_Install"
|
|
||||||
|
|
||||||
sh ./clean.sh ${SELF}
|
sh ./clean.sh ${SELF}
|
||||||
|
|
||||||
|
@ -50,11 +48,11 @@ setup_entropy ${STAGEDIR}/work
|
||||||
|
|
||||||
cat > ${STAGEDIR}/work/etc/fstab << EOF
|
cat > ${STAGEDIR}/work/etc/fstab << EOF
|
||||||
# Device Mountpoint FStype Options Dump Pass#
|
# Device Mountpoint FStype Options Dump Pass#
|
||||||
/dev/ufs/${LABEL} / ufs ro,noatime 1 1
|
/dev/ufs/${VGALABEL} / ufs ro,noatime 1 1
|
||||||
tmpfs /tmp tmpfs rw,mode=01777 0 0
|
tmpfs /tmp tmpfs rw,mode=01777 0 0
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
makefs -B little -o label=${LABEL} ${STAGEDIR}/root.part ${STAGEDIR}/work
|
makefs -B little -o label=${VGALABEL} ${STAGEDIR}/root.part ${STAGEDIR}/work
|
||||||
|
|
||||||
UEFIBOOT=
|
UEFIBOOT=
|
||||||
GPTDUMMY=
|
GPTDUMMY=
|
||||||
|
|
Loading…
Reference in New Issue