summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-06-18 18:33:23 +0000
committerEric Hameleers <alien@slackware.com>2018-06-19 09:00:34 +0200
commit8b12b1496e7d9715d7b4938843ab72bec9dd2c2b (patch)
tree5a283297ee9c78245bd0e51cb08bcbbff51d8051 /source
parent04696baa146387e730d10a1e0b0a540989eea8e6 (diff)
downloadcurrent-8b12b1496e7d9715d7b4938843ab72bec9dd2c2b.tar.gz
Mon Jun 18 18:33:23 UTC 201820180618183323
isolinux/initrd.img: Rebuilt. Use -C crc32 when compressing the initrd/modules with xz. usb-and-pxe-installers/usbboot.img: Rebuilt. Use -C crc32 when compressing the initrd/modules with xz.
Diffstat (limited to 'source')
-rw-r--r--source/installer/ChangeLog.txt5
-rwxr-xr-xsource/installer/build_installer.sh10
2 files changed, 10 insertions, 5 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 197f94b1..b16f0c48 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,8 @@
+Mon Jun 18 17:53:56 UTC 2018
+ When compressing the initrd with xz, add: -C crc32
+ Use xzcat instead of zcat in a few places where the build script wants to
+ extract a previous initrd.
++--------------------------+
Mon Jun 18 04:13:53 UTC 2018
Copy libefiboot to the installer (needed by efibootmgr).
Compress the kernel modules with xz.
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index cbccd276..290adcd5 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -480,7 +480,7 @@ echo "--- Unpacking the old initrd ---"
mkdir -p -m755 $PKG/$ARCH-installer-filesystem
cd $PKG/$ARCH-installer-filesystem
-zcat -f${VERBOSE1} $INITRDIMG | cpio -di${VERBOSE1}
+xzcat -f${VERBOSE1} $INITRDIMG | cpio -di${VERBOSE1}
# Wipe the Kernel modules:
echo "--- Removing old kernel modules ---"
@@ -535,7 +535,7 @@ cd $TMP/extract-packages
# Unpack the real i586/current Slackware initrd.img (or a custom one specified
# with the '-I' parameter):
-zcat -f${VERBOSE1} $INITRDIMG | cpio -di${VERBOSE1}
+xzcat -f${VERBOSE1} $INITRDIMG | cpio -di${VERBOSE1}
# Wipe the binaries and x86 specific stuff. This will leave us with
# just the directories and shell scripts:
@@ -1572,7 +1572,7 @@ compress_modules()
if [ $COMPRESS_MODS -eq 1 ]; then
echo "--- Compressing kernel modules ---"
cd $PKG/$ARCH-installer-filesystem
- find ./lib/modules -type f -name "*.ko" -exec xz -9f {} \;
+ find ./lib/modules -type f -name "*.ko" -exec xz -9f -C crc32 {} \;
for i in $(find ./lib/modules -type l -name "*.ko") ; do ln -s $( readlink $i).xz $i.xz ; rm $i ; done
cd - 1>/dev/null
fi
@@ -1778,7 +1778,7 @@ if [ $SPLIT_INITRD -eq 1 ]; then
# Determine the size of the installer:
echo " Installer size (uncompressed): $( du -sh --exclude=$kv . )"
find . -path ./lib/modules/$kv -prune -o -print \
- | cpio -o -H newc | xz -9fv > $CWD/initrd${usek}.img
+ | cpio -o -H newc | xz -9fv -C crc32 > $CWD/initrd${usek}.img
echo " New installer image for kernel $KVER$usek is ${CWD}/initrd${usek}.img"
done
cat $SLACKROOT/isolinux/isolinux.cfg | sed \
@@ -1799,7 +1799,7 @@ fi
if [ $SPLIT_INITRD -eq 0 ]; then
# Determine the size of the installer:
echo " Installer size (uncompressed): $( du -sh . )"
- find . | cpio -o -H newc | xz -9fv > $CWD/initrd.img
+ find . | cpio -o -H newc | xz -9fv -C crc32 > $CWD/initrd.img
echo " New installer image is ${CWD}/initrd.img"
cp -a $SLACKROOT/isolinux/isolinux.cfg $CWD/
fi