manuel/live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the Linux kernel name got from "binary".

Browse Source 
Use the Linux kernel name "${LINUX}" got from "binary".
This commit is contained in:
Steven Shiau 2024-11-08 08:13:36 +08:00
parent 19eb1a7fe4
commit 54395accc7
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/binary_bootloader_splash
View File

@ -97,7 +97,7 @@ _SECOND="$(date $DATE_UTC_OPTION -d "${_DATE}" +%S)"
_TIMEZONE="$(date $DATE_UTC_OPTION -d "${_DATE}" +%Z)"
_TIMEZONE_NUM="$(date $DATE_UTC_OPTION -d "${_DATE}" +%z)"
_LINUX_VERSIONS="$(for _LINUX in chroot/boot/vmlinuz-* ; do chroot chroot apt-cache policy $(basename ${_LINUX} | sed -e 's|vmlinuz-|linux-image-|') | awk '/Installed: / { print $2 }' ; done | sort -Vru | tr "\n" " ")"
_LINUX_VERSIONS="$(for _LINUX in chroot/boot/${LINUX}-* ; do chroot chroot apt-cache policy $(basename ${_LINUX} | sed -e "s|${LINUX}-|linux-image-|") | awk '/Installed: / { print $2 }' ; done | sort -Vru | tr "\n" " ")"
_LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed: / { print $2 }')"
_LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')"

12
scripts/build/binary_grub-legacy
View File

@ -131,8 +131,8 @@ LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Default entries
DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
DEFAULT_KERNEL="$(basename chroot/boot/"${LINUX}"-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e "s|${LINUX}-||")"
Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_LIVE}"
@ -141,9 +141,9 @@ then
Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_LIVE_FAILSAFE}"
fi
for KERNEL in chroot/boot/vmlinuz-*
for KERNEL in chroot/boot/"${LINUX}"-*
do
VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
VERSION="$(basename ${KERNEL} | sed -e "s|${LINUX}-||")"
Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${LB_BOOTAPPEND_LIVE}"
Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${LB_BOOTAPPEND_LIVE_FAILSAFE}"
@ -157,11 +157,11 @@ then
LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
LINUX_INSTALL="title\t\tInstaller:\nroot"
VMLINUZ_DI="install/vmlinuz"
VMLINUZ_DI="install/${LINUX}"
INITRD_DI="install/initrd.gz"
APPEND_DI="vga=normal"
VMLINUZ_GI="install/gtk/vmlinuz"
VMLINUZ_GI="install/gtk/${LINUX}"
INITRD_GI="install/gtk/initrd.gz"
APPEND_GI="vga=788"

22
scripts/build/binary_grub_cfg
View File

@ -116,8 +116,8 @@ fi
# Default entries
DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
DEFAULT_KERNEL="$(basename chroot/boot/"${LINUX}"-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e "s|${LINUX}-||")"
KERNEL_LIVE="/${INITFS}/${DEFAULT_KERNEL}"
INITRD_LIVE="/${INITFS}/${DEFAULT_INITRD}"
@ -152,10 +152,10 @@ done
if [ "${_AMD64_686_NUMBER}" -ge 2 ] ; then
# Default entries
AMD64_KERNEL="$(basename chroot/boot/vmlinuz-*amd64)"
AMD64_INITRD="initrd.img-$(echo ${AMD64_KERNEL} | sed -e 's|vmlinuz-||')"
_686_KERNEL="$(basename chroot/boot/vmlinuz-*686)"
_686_INITRD="initrd.img-$(echo ${_686_KERNEL} | sed -e 's|vmlinuz-||')"
AMD64_KERNEL="$(basename chroot/boot/"${LINUX}"-*amd64)"
AMD64_INITRD="initrd.img-$(echo ${AMD64_KERNEL} | sed -e "s|${LINUX}-||")"
_686_KERNEL="$(basename chroot/boot/"${LINUX}"-*686)"
_686_INITRD="initrd.img-$(echo ${_686_KERNEL} | sed -e "s|${LINUX}-||")"
Grub_live_autodetect_menu_entry "Live system (autodetect)" \
"/${INITFS}/${AMD64_KERNEL}" \
@ -187,13 +187,13 @@ else
fi
_COUNT=0
for KERNEL in chroot/boot/vmlinuz-*; do
for KERNEL in chroot/boot/"${LINUX}"-*; do
_COUNT=$(( $_COUNT + 1 ))
done
if [ $_COUNT -gt 1 ]; then
for KERNEL in chroot/boot/vmlinuz-*; do
VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
for KERNEL in chroot/boot/"${LINUX}"-*; do
VERSION="$(basename ${KERNEL} | sed -e "s|${LINUX}-||")"
Grub_live_menu_entry "Live system, kernel ${VERSION}" \
"/${INITFS}/$(basename ${KERNEL})" \
@ -218,11 +218,11 @@ rm -f "${LIVE_ENTRIES_TMP}"
if [ "${LB_DEBIAN_INSTALLER}" != "none" ]; then
ENABLE_INSTALL_MENU="true"
KERNEL_DI="/install/vmlinuz"
KERNEL_DI="/install/"${LINUX}""
INITRD_DI="/install/initrd.gz"
APPEND_DI="vga=normal ${LB_BOOTAPPEND_INSTALL} --- quiet"
KERNEL_GI="/install/gtk/vmlinuz"
KERNEL_GI="/install/gtk/"${LINUX}""
INITRD_GI="/install/gtk/initrd.gz"
APPEND_GI="vga=788 ${LB_BOOTAPPEND_INSTALL} --- quiet"

4
scripts/build/binary_hdd
View File

@ -277,11 +277,11 @@ cat > chroot/grub.sh << EOF
#!/bin/sh
cd binary.tmp
grub --batch << EOM
find /live/vmlinuz
find /live/${LINUX}
EOM
EOF
rootpartition="$(Chroot chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz')"
rootpartition="$(Chroot chroot 'sh grub.sh' 2>/dev/null | grep -A 1 "find /live/${LINUX}" | grep -v "find /live/${LINUX}")"
hdddev="$(echo $rootpartition | sed -e 's|,[[:digit:]]||')"
echo "Root partition is $rootpartition, device is: $hdddev"

4
scripts/build/binary_loadlin
View File

@ -74,7 +74,7 @@ case "${LB_ARCHITECTURE}" in
mkdir -p binary/install
cat > binary/install/install.bat << EOF
\tools\loadlin.exe vmlinuz initrd=initrd.gz
\tools\loadlin.exe ${LINUX} initrd=initrd.gz
EOF
if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]; then
@ -82,7 +82,7 @@ EOF
mkdir -p binary/install/gtk
cat > binary/install/gtk/install.bat << EOF
\tools\loadlin.exe \install\vmlinuz initrd=initrd.gz vga=788
\tools\loadlin.exe \install\${LINUX} initrd=initrd.gz vga=788
EOF
fi

2
scripts/build/binary_netboot
View File

@ -55,7 +55,7 @@ cd binary.tmp
# Moving kernel and initrd image arround
mkdir tftpboot/live
mv */live/vmlinuz* */live/initrd* tftpboot/live
mv */live/${LINUX}* */live/initrd* tftpboot/live
tar cf ../${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar *

2
scripts/build/binary_onie
View File

@ -219,7 +219,7 @@ find . | cpio -o -H newc | $COMPRESS > ${WORKDIR}/initrd.img
cd ${CURDIR}
echo -n "."
KERNEL='vmlinuz'
KERNEL="${LINUX}"
IN_KERNEL=$EXTRACTDIR/live/$KERNEL
[ -r $IN_KERNEL ] || {
echo "" #force newline

14
scripts/build/binary_syslinux
View File

@ -160,11 +160,11 @@ then
# Rename kernel files
# If multiple initrd images are being generated (by DKMS packages, etc),
# we likely only want the latest version.
ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-* | head -n 1) binary/${_INITRAMFS}/vmlinuz
ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/${LINUX}-* | head -n 1) binary/${_INITRAMFS}/${LINUX}
ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-* | head -n 1) binary/${_INITRAMFS}/initrd.img
sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \
-e "s|@LINUX@|/${_INITRAMFS}/vmlinuz|g" \
-e "s|@LINUX@|/${_INITRAMFS}/${LINUX}|g" \
-e "s|@INITRD@|/${_INITRAMFS}/initrd.img|g" \
"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
@ -181,7 +181,7 @@ then
# Rename kernel files
# If multiple initrd images are being generated (by DKMS packages, etc),
# we likely only want the latest version.
ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-*-${_FLAVOUR} | head -n 1) binary/${_INITRAMFS}/vmlinuz${_NUMBER}
ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/${LINUX}-*-${_FLAVOUR} | head -n 1) binary/${_INITRAMFS}/${LINUX}${_NUMBER}
ln -f $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-*-${_FLAVOUR} | head -n 1) binary/${_INITRAMFS}/initrd${_NUMBER}.img
if [ "${_NUMBER}" -gt 1 ]
@ -193,7 +193,7 @@ then
fi
sed -i -e "s|@FLAVOUR@|${_FLAVOUR}|g" \
-e "s|@LINUX@|/${_INITRAMFS}/vmlinuz${_NUMBER}|g" \
-e "s|@LINUX@|/${_INITRAMFS}/${LINUX}${_NUMBER}|g" \
-e "s|@INITRD@|/${_INITRAMFS}/initrd${_NUMBER}.img|g" \
"${_TARGET}/live.cfg"
done
@ -222,7 +222,7 @@ _SECOND="$(date $DATE_UTC_OPTION -d "${_DATE}" +%S)"
_TIMEZONE="$(date $DATE_UTC_OPTION -d "${_DATE}" +%Z)"
_TIMEZONE_NUM="$(date $DATE_UTC_OPTION -d "${_DATE}" +%z)"
_LINUX_VERSIONS="$(for _LINUX in chroot/boot/vmlinuz-* ; do chroot chroot apt-cache policy $(basename ${_LINUX} | sed -e 's|vmlinuz-|linux-image-|') | awk '/Installed: / { print $2 }' ; done | sort -Vru | tr "\n" " ")"
_LINUX_VERSIONS="$(for _LINUX in chroot/boot/${LINUX}-* ; do chroot chroot apt-cache policy $(basename ${_LINUX} | sed -e "s|${LINUX}-|linux-image-|") | awk '/Installed: / { print $2 }' ; done | sort -Vru | tr "\n" " ")"
_LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed: / { print $2 }')"
_LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')"
@ -263,9 +263,9 @@ do
fi
done
KERNEL_DI="/install/vmlinuz"
KERNEL_DI="/install/${LINUX}"
INITRD_DI="/install/initrd.gz"
KERNEL_GI="/install/gtk/vmlinuz"
KERNEL_GI="/install/gtk/${LINUX}"
INITRD_GI="/install/gtk/initrd.gz"
sed -i \

4
scripts/build/binary_win32-loader
View File

@ -82,7 +82,7 @@ cat > binary/win32-loader.ini << EOF
kernel=linux
arch=${LB_ARCHITECTURE}
default_desktop=gnome
${LB_ARCHITECTURE}/linux=install/vmlinuz
${LB_ARCHITECTURE}/linux=install/${LINUX}
${LB_ARCHITECTURE}/initrd=install/initrd.gz
EOF
@ -90,7 +90,7 @@ EOF
then
cat >> binary/win32-loader.ini << EOF
${LB_ARCHITECTURE}/gtk/linux=install/vmlinuz
${LB_ARCHITECTURE}/gtk/linux=install/${LINUX}
${LB_ARCHITECTURE}/gtk/initrd=install/gtk/initrd.gz
EOF