diff --git a/blends/devuan-minimal-live/TODO.org b/blends/devuan-minimal-live/TODO.org index 1933f30..67c74d0 100644 --- a/blends/devuan-minimal-live/TODO.org +++ b/blends/devuan-minimal-live/TODO.org @@ -4,14 +4,15 @@ * DONE Amend motd -* IN-PROGRESS amend isolinux_overlay/isolinux.cfg +* DONE amend isolinux_overlay/isolinux.cfg ** DONE change initrd name -* TODO put correct initrd.img in binary/live/ +* DONE put correct initrd.img in binary/live/ * IN-PROGRESS Put debs in custom_debs * TODO Include memtest86+.bin in binary/live/ - - +* TODO put README +* TODO put script to remove firmware packages +* TODO Rebuild all diff --git a/blends/devuan-minimal-live/ascii/config b/blends/devuan-minimal-live/ascii/config index cee0bed..d7eb036 100644 --- a/blends/devuan-minimal-live/ascii/config +++ b/blends/devuan-minimal-live/ascii/config @@ -236,26 +236,27 @@ base_packages+=( #### TODO: ADD refractainstaller #### ADDED: geoip-bin -#extra_packages+=( -# b43-fwcutter -# firmware-atheros -# firmware-b43-installer -# firmware-b43legacy-installer -# firmware-bnx2 -# firmware-bnx2x -# firmware-brcm80211 -# firmware-intelwimax -# firmware-iwlwifi -# firmware-libertas -# firmware-linux-nonfree -# firmware-myricom -# firmware-netxen -# firmware-qlogic -# firmware-ralink -# firmware-realtek -# firmware-ti-connectivity -# firmware-zd1211 -#) +extra_packages+=( + b43-fwcutter + firmware-atheros + firmware-b43-installer + firmware-b43legacy-installer + firmware-bnx2 + firmware-bnx2x + firmware-brcm80211 + firmware-intelwimax + firmware-iwlwifi + firmware-libertas + firmware-linux-nonfree + firmware-myricom + firmware-netxen + firmware-qlogic + firmware-realtek + firmware-ti-connectivity + firmware-zd1211 + refractainstaller-base + refractasnapshot-base +) purge_packages=( diff --git a/blends/devuan-minimal-live/ascii/custom_debs/setnet_0.3.2+devuan1.2_all.deb b/blends/devuan-minimal-live/ascii/custom_debs/setnet_0.3.2+devuan1.2_all.deb new file mode 100644 index 0000000..4b976d4 Binary files /dev/null and b/blends/devuan-minimal-live/ascii/custom_debs/setnet_0.3.2+devuan1.2_all.deb differ diff --git a/blends/devuan-minimal-live/ascii/scripts/create_initrd.sh b/blends/devuan-minimal-live/ascii/scripts/create_initrd.sh index 55ec76e..080c94f 100755 --- a/blends/devuan-minimal-live/ascii/scripts/create_initrd.sh +++ b/blends/devuan-minimal-live/ascii/scripts/create_initrd.sh @@ -51,11 +51,10 @@ INITRD_NEW=$2 INITRD_COMPR=$3 INITRD_MICRO=$4 -echo "$0: got $1 $2 $3 $4" WORK_DIR=/tmp/initrd_new -MODULE_DIR=lib/modules/`uname -r`/kernel +MODULE_DIRS=$(ls lib/modules/) #### ## @@ -77,11 +76,11 @@ fi INITRD_FILE=`file -L ${INITRD_ORIG}` -if [ `echo ${INITRD_FILE} | grep gzip | wc -l` = 1 ]; then +if [ `echo ${INITRD_FILE} | grep gzip | wc -l` == 1 ]; then INITRD_UNCOMPRESS=zcat; -elif [ `echo ${INITRD_FILE} | grep bzip2 | wc -l` = 1 ]; then +elif [ `echo ${INITRD_FILE} | grep bzip2 | wc -l` == 1 ]; then INITRD_UNCOMPRESS=bzcat; -elif [ `echo ${INITRD_FILE} | grep " xz " | wc -l` = 1 ]; then +elif [ `echo ${INITRD_FILE} | grep " xz " | wc -l` == 1 ]; then INITRD_UNCOMPRESS=xzcat; else echo "Unable to determine the format of ${INITRD_ORIG} -- Aborting!!!" @@ -100,53 +99,99 @@ echo "done!" ## that the root partition is not over nfs... ## -echo -n "===> Removing network drivers..." +for M in ${MODULE_DIRS}; do + echo "===> Removing drivers for kernel version ${M} <===" -##rm -rf ${MODULE_DIR}/drivers/net/ethernet/* -rm -rf ${MODULE_DIR}/drivers/net/* + MODULE_DIR="lib/modules/${M}/kernel" + + echo -n "===> Removing unnecessary network drivers..." + + ##rm -rf ${MODULE_DIR}/drivers/net/ethernet/* + rm -rf ${MODULE_DIR}/drivers/net/* + + echo "done!" + + #### + ## + ## Remove unnecessary filesystem support + ## + ## + + echo -n "===> Removing unnecessary filesystems drivers..." + + ##rm -rf ${MODULE_DIR}/fs/nfs + rm -rf ${MODULE_DIR}/fs/xfs + rm -rf ${MODULE_DIR}/fs/btrfs + ##rm -rf ${MODULE_DIR}/fs/ext4 + rm -rf ${MODULE_DIR}/fs/fat + rm -rf ${MODULE_DIR}/fs/fuse + rm -rf ${MODULE_DIR}/fs/hfs + rm -rf ${MODULE_DIR}/fs/hfsplus + rm -rf ${MODULE_DIR}/fs/reiserfs + rm -rf ${MODULE_DIR}/fs/ntfs + rm -rf ${MODULE_DIR}/fs/jfs + rm -rf ${MODULE_DIR}/fs/jffs2 + rm -rf ${MODULE_DIR}/fs/udf + rm -rf ${MODULE_DIR}/fs/nls + rm -rf ${MODULE_DIR}/fs/nfs_common + + echo "done!" + + #### + ## + ## Remove the lftp and qla2xxx drivers (FibreChannel) + ## + + echo -n "===> Removing unnecessary SCSI drivers..." + + + rm -rf ${MODULE_DIR}/drivers/scsi/lpfc + rm -rf ${MODULE_DIR}/drivers/scsi/qla2xxx + rm -rf ${MODULE_DIR}/drivers/scsi/fnic + rm -rf ${MODULE_DIR}/drivers/scsi/csiostor + rm -rf ${MODULE_DIR}/drivers/scsi/isci + rm -rf ${MODULE_DIR}/drivers/scsi/cxgbi + rm -rf ${MODULE_DIR}/drivers/scsi/megaraid + rm -rf ${MODULE_DIR}/drivers/scsi/mpt2sas + rm -rf ${MODULE_DIR}/drivers/scsi/mpt3sas + rm -rf ${MODULE_DIR}/drivers/scsi/pm8001 + rm -rf ${MODULE_DIR}/drivers/scsi/qla4xxx + rm -rf ${MODULE_DIR}/drivers/scsi/aic7xxx + rm -rf ${MODULE_DIR}/drivers/scsi/bfa + + echo "done!" + + ## remove the gpu driver folder altogether + + echo -n "===> Removing unnecessary GPU drivers..." + + rm -rf ${MODULE_DIR}/drivers/gpu/ + + echo "done" + + echo -n "===> Removing unnecessary firmware..." + + rm -rf ${MODULE_DIR}/firmware/radeon/ + rm -rf ${MODULE_DIR}/firmware/cxgb4 + + echo "done" + + +done + +## +## Remove unnecessary stuff in /bin and /sbin +## + +echo -n "===> Removing unnecessary stuff in /bin and /sbin..." + +#rm -rf bin/rsync bin/wget +#rm -rf sbin/acpid +#rm -rf lib/systemd echo "done!" -#### -## -## Remove unnecessary filesystem support -## -## - -echo -n "===> Removing unnecessary filesystems drivers..." - - -##rm -rf ${MODULE_DIR}/fs/nfs -rm -rf ${MODULE_DIR}/fs/xfs -rm -rf ${MODULE_DIR}/fs/btrfs -##rm -rf ${MODULE_DIR}/fs/ext4 -rm -rf ${MODULE_DIR}/fs/fat -rm -rf ${MODULE_DIR}/fs/fuse -rm -rf ${MODULE_DIR}/fs/hfs -rm -rf ${MODULE_DIR}/fs/hfsplus -rm -rf ${MODULE_DIR}/fs/reiserfs -rm -rf ${MODULE_DIR}/fs/ntfs -rm -rf ${MODULE_DIR}/fs/jfs -rm -rf ${MODULE_DIR}/fs/jffs2 -rm -rf ${MODULE_DIR}/fs/udf -rm -rf ${MODULE_DIR}/fs/nls -rm -rf ${MODULE_DIR}/fs/nfs_common - -echo "done!" - -#### -## -## Remove the lftp and qla2xxx drivers (FibreChannel) -## - -echo -n "===> Removing unnecessary SCSI drivers..." - - -rm -rf ${MODULE_DIR}/drivers/scsi/lpfc -rm -rf ${MODULE_DIR}/drivers/scsi/qla2xxx - -echo "done!" #### ## @@ -160,46 +205,6 @@ echo -n "===> Removing unnecessary libraries in /usr/lib..." echo "done!" #### -## -## Remove unnecessary stuff in /bin and /sbin -## - -echo -n "===> Removing unnecessary stuff in /bin and /sbin..." - -#rm -rf bin/rsync bin/wget -#rm -rf sbin/acpid -#rm -rf lib/systemd - -echo "done!" - -#### -## -## Now we create the new slim initrd -## - -# echo -n "===> Creating new initrd '${INITRD_NEW}' using ${INITRD_COMPR}..." - - -# find . | cpio -H newc -o | `echo ${INITRD_COMPR}` > ${INITRD_NEW} - -# echo "done!" - -#### -## -## Now we go for the extremely stripped down initrd -## - -rm -rf ${MODULE_DIR}/drivers/scsi/fnic -rm -rf ${MODULE_DIR}/drivers/scsi/csiostor -rm -rf ${MODULE_DIR}/drivers/scsi/isci -rm -rf ${MODULE_DIR}/drivers/scsi/cxgbi -rm -rf ${MODULE_DIR}/drivers/scsi/megaraid -rm -rf ${MODULE_DIR}/drivers/scsi/mpt2sas -rm -rf ${MODULE_DIR}/drivers/scsi/mpt3sas -rm -rf ${MODULE_DIR}/drivers/scsi/pm8001 -rm -rf ${MODULE_DIR}/drivers/scsi/qla4xxx -rm -rf ${MODULE_DIR}/drivers/scsi/aic7xxx -rm -rf ${MODULE_DIR}/drivers/scsi/bfa #### diff --git a/blends/devuan-minimal-live/config b/blends/devuan-minimal-live/config index 708f5e0..3d6cb47 100644 --- a/blends/devuan-minimal-live/config +++ b/blends/devuan-minimal-live/config @@ -24,8 +24,8 @@ default_shell="/bin/bash" #grubversion="grub-efi-amd64" ##release="ascii" -mirror="http://devuan.mine.nu/merged" -section="main" +mirror="http://pkgmaster.devuan.org/merged" +section="main contrib non-free" base_packages_option=(--no-install-recommends) diff --git a/blends/devuan-minimal-live/devuan-minimal-live.blend b/blends/devuan-minimal-live/devuan-minimal-live.blend index 442d933..929b8c9 100644 --- a/blends/devuan-minimal-live/devuan-minimal-live.blend +++ b/blends/devuan-minimal-live/devuan-minimal-live.blend @@ -3,7 +3,7 @@ # live-sdk is written and maintained by Ivan J. # # This file is part of live-sdk -# devuan-minimal-live.blend is maintained by KatolaZ +# devuan-minimal-live.blend is maintained by KatolaZ # # This source code is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ blend_preinst() { notice "copying blend-specific debs" ## TODO: copy the custom debs - ##cp -fv "$blend_release_path"/custom_debs/*.deb "$R/extra/custom-packages" + cp -fv "$blend_release_path"/custom_debs/*.deb "$R/extra/custom-packages" } blend_postinst() { @@ -54,12 +54,10 @@ blend_postinst() { } ## TODO: ENABLE THIS - #install-custdebs || zerr + install-custdebs || zerr pushd "$strapdir" sudo rsync -avx --no-o --no-g "$blend_release_path"/rootfs_overlay/* . || zerr sudo chmod 755 etc/init.d/boot_beep - ## TODO: - ## insserv boot_beep popd blend_finalize || zerr @@ -300,19 +298,41 @@ INITRD_COMPR="xz --check=crc32 --x86 -6 -" /create_initrd.sh /initrd.img /boot/\${SLIM_INITRD} \ "\${INITRD_COMPR}" \${MICRO_INITRD} -rm /initrd.img -ln -s /boot/\${MICRO_INITRD} /initrd.img +rm -f $(realpath /initrd.img) +rm -f $(realpath /initrd.img.old) + +echo "====> Content of /boot before rm:" + +ls /boot + +rm -f /initrd.img +rm -f /initrd.img.old +rm -f /boot/initrd.img-* + + +echo "====> Content of /boot AFTER rm:" + +ls /boot + +ln -s \${MICRO_INITRD} /initrd.img + + ## rm create_initrd.sh -##sudo rm /create_initrd.sh +##rm /create_initrd.sh ## package list dpkg -l | awk '/^ii/ { print $2 " " $3 }' > /home/${username}/package_list -apt-get update +##apt-get update apt-get clean +rm /var/cache/apt/*.bin updatedb + EOF + + cp ${strapdir}/finalize ${strapdir}/finalize.bak + } @@ -326,5 +346,10 @@ blend_finalize() { put_finalize - chroot-script -d finalize || zerr + #chroot-script -d finalize || zerr + chroot-script finalize || zerr + + printf "copying ${strapdir}/boot/initrd.img to ${workdir}/binary/live/..." + sudo cp -L ${strapdir}/boot/initrd.img ${workdir}/binary/live/ + echo "done" }