From d97ad4a162ce5b5c5ee81e3e30c00bbd8be87476 Mon Sep 17 00:00:00 2001 From: isaagar Date: Thu, 1 Feb 2018 18:26:54 +0530 Subject: [PATCH 1/4] use conf file for live-build config generation --- mkbuild | 133 +++++++++++++++++++------------------------------------- 1 file changed, 45 insertions(+), 88 deletions(-) diff --git a/mkbuild b/mkbuild index 9778a69..6bd4de2 100755 --- a/mkbuild +++ b/mkbuild @@ -23,129 +23,86 @@ SECONDS=0 DATE=`date +%Y%m%d` +Info () { + echo "I: ${*}" >&2 +} + +Error () { + echo "E: ${*}" >&2 +} + + SETUP(){ clear cd $DIR - #Installing required packages - echo " ###############################################" - echo " # SETUP #" - echo " ###############################################" - echo " ---- Installing packages ---- " - for PKG in apt-cacher-ng debootstrap live-build - do - dpkg -s $PKG &> /dev/null - if [ $? -eq 1 ];then - apt-get install -y $PKG - fi - done - - #Copying live build scripts - if [ $RELEASE == "hamara-sugam" ]; then - cp -rv data/hamara-sugam/lb_scripts/* /usr/lib/live/build/ - echo " [Done] Copying scripts for Hamara Sugam " - else - cp -rv data/hamara/lb_scripts/* /usr/lib/live/build/ - echo " [Done] Copying scripts for hamara" - fi + Info "Copying live build scripts" + cp -rv data/$RELEASE/lb_scripts/* /usr/lib/live/build/ + Info "Replacing bootloader config files" + rm -rf /usr/share/live/build/bootloaders + cp -r data/$RELEASE/bootloaders /usr/share/live/build - #Replacing bootloader config files if [ $RELEASE == "hamara-sugam" ]; then - rm -rf /usr/share/live/build/bootloaders - cp -r data/hamara-sugam/bootloaders /usr/share/live/build + ln -sf /usr/share/live/build/data/debian-cd/squeeze /usr/share/live/build/data/debian-cd/namaste else - rm -rf /usr/share/live/build/bootloaders - cp -r data/hamara/bootloaders /usr/share/live/build + ln -sf /usr/share/live/build/data/debian-cd/squeeze /usr/share/live/build/data/debian-cd/svastik + ln -sf /usr/share/debootstrap/scripts/sid /usr/share/debootstrap/scripts/svastik fi - - #check if namaste debootstrap exists - if [ -e /usr/share/debootstrap/scripts/namaste ]; then - echo " [OK] namaste debootstrap script exists " - else - echo " >>>> Copying namaste debootstrap script ... " - ln -s /usr/share/debootstrap/scripts/sid /usr/share/debootstrap/scripts/namaste - fi - - if [ -e /usr/share/live/build/data/debian-cd/namaste ] - then - echo " [OK] File is present. " - else - echo " ->>> linking file " - ln -s /usr/share/live/build/data/debian-cd/squeeze /usr/share/live/build/data/debian-cd/namaste - - echo " [Done] File linking" - fi } CLEAN(){ if [ -d "$DIR/build_area/$RELEASE-$ARCH" ]; then - #Change to target directory + Info "Change to target directory" cd $DIR/build_area/$RELEASE-$ARCH echo "#################################################" - echo "# Cleaning build files of $ARCH architecture #" + Info " Cleaning build files of $ARCH architecture " echo "#################################################" lb clean else - echo -e "\n[Skipped] Build area not present for $ARCH architecture " + Info "[Skipped] Build area not present for $ARCH architecture " fi } BUILD(){ - #creating build directory + Info "Creating build directory" mkdir -p $DIR/build_area/$RELEASE-$ARCH - #copying config files - cp -r $DIR/config.d/$RELEASE/* $DIR/build_area/$RELEASE-$ARCH/ - - #changing to build directory + Info "Changing to build directory" cd $DIR/build_area/$RELEASE-$ARCH - #copy installer files for i386 arch and set kernel flavour + Info "Copying config files" + . $DIR/$RELEASE.conf + cp -rv $DIR/config.d/$RELEASE/* $DIR/build_area/$RELEASE-$ARCH/ + + if [ $ARCH == i386 ] ;then + Info "Copy installer files for i386 arch and set kernel flavour" cp -r $DIR/data/includes/* $DIR/build_area/$RELEASE-$ARCH/config/includes.installer/ lb config -k 686 fi - #Setting parameters - lb config --architectures $ARCH - lb config --backports true - lb config --security true - lb config --parent-mirror-bootstrap http://$MIRROR/hamara-sugam - lb config --parent-mirror-chroot http://$MIRROR/hamara-sugam - lb config --parent-mirror-binary http://$MIRROR/hamara-sugam - lb config --parent-mirror-debian-installer http://$MIRROR/hamara-sugam - lb config --mirror-bootstrap http://$MIRROR/hamara-sugam - lb config --mirror-chroot http://$MIRROR/hamara-sugam - lb config --mirror-binary http://$MIRROR/hamara-sugam - lb config --mirror-debian-installer http://$MIRROR/hamara-sugam - lb config --parent-mirror-binary-security http://security.debian.org/ - lb config --parent-mirror-chroot-security http://security.debian.org/ - lb config --mirror-chroot-security http://security.debian.org/ - lb config --mirror-binary-security http://security.debian.org/ - echo " ---- Starting build ---- " + Info " ---- Starting build ---- " lb build if [ $? -eq 0 ];then - echo "[Done] ISO Build successfully for $ARCH architecture " + Info " ISO Build successfully for $ARCH architecture " - # Renaming the ISO - echo " ---- Renaming ISO ---- " + Info "Renaming the ISO" mv *.hybrid.iso "$RELEASE"-live-"$VER"-"$ARCH".iso - # Calculating sha1sum - echo "==== Calculating CHECKSUM ==== " + Info "Calculating sha1sum" for i in 1 256 512 do - echo -e "\n Generating SHA"$i"SUM " + echo "Generating SHA"$i"SUM" for j in *.iso *.contents *.packages do sha"$i"sum $j >> SHA"$i"SUMS done done - # Create output directory + Info "Create output directory" mkdir -p $DIR/output/$RELEASE-$ARCH-$DATE for i in *.iso *.contents *.packages *SUMS @@ -154,12 +111,12 @@ BUILD(){ done duration=$SECONDS - echo " Build completed in $(($duration / 60)) minutes and $(($duration % 60)) seconds " + Info " Build completed in $(($duration / 60)) minutes and $(($duration % 60)) seconds " echo " ---- Now, test your ISO ---- " echo " Tip : Make bootable USB stick with Etcher " echo " [Link] https://etcher.io/ " else - echo " [Failed] Try again. " + Error " [Failed] Try again. " fi } @@ -193,7 +150,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR if [ "$EUID" -ne 0 ] then - echo " ---> Please run as root <--- " + Info " ---> Please run as root <--- " echo "man ./HELP for more info" exit fi @@ -203,14 +160,14 @@ help) HELP ;; iso) - if [[ "$#" -eq 5 ]] && [[ "$2" = @(amd64|i386|all) ]] && [[ "$3" = @(in.devel.hamaralinux.org|devel.hamaralinux.org) ]] && [[ "$4" = @(minimal|hamara|hamara-sugam) ]] && [[ "$5" = @(alpha|beta|final) ]] + if [[ "$#" -eq 5 ]] && [[ "$2" = @(amd64|i386|all) ]] && [[ "$3" = @(in.devel.hamaralinux.org|devel.hamaralinux.org) ]] && [[ "$4" = @(minimal|hamara|hamara-sugam) ]] && [[ "$5" = @(pre-alpha|alpha|beta|final) ]] then export ARCH=$2 export MIRROR=$3 export RELEASE=$4 export VER=2.0-$5 else - echo "XXX-< Invalid parameters >-XXX" + Error "XXX-< Invalid parameters >-XXX" HELP exit 1 fi @@ -246,8 +203,8 @@ clean) CLEAN fi else - echo -e "\n !!! Invalid option !!!" - echo -e "\n Valid Usage - \n ./mkbuild clean ARCH RELEASE " + Error " !!! Invalid option !!!" + echo "Valid Usage - ./mkbuild clean ARCH RELEASE " HELP fi ;; @@ -263,14 +220,14 @@ purge) for ARCH in amd64 i386 do CLEAN - rm -rf $DIR/build_area/$RELEASE-$ARCH && echo -e "\n --- Removing build area --- \n" + rm -rf $DIR/build_area/$RELEASE-$ARCH && Info "--- Removing build area ---" done else CLEAN - rm -rf $DIR/build_area/$RELEASE-$ARCH && echo -e "\n --- Removing build area --- \n" + rm -rf $DIR/build_area/$RELEASE-$ARCH && Info "--- Removing build area ---" fi else - echo "XX-< Invalid option >-XX" + Error "XX-< Invalid option >-XX" HELP fi ;; @@ -279,4 +236,4 @@ purge) HELP ;; -esac \ No newline at end of file +esac -- 2.17.1 From 498656f973851f5887bf71d66dc89c6188e677b4 Mon Sep 17 00:00:00 2001 From: isaagar Date: Thu, 1 Feb 2018 18:33:03 +0530 Subject: [PATCH 2/4] disabled backports,debian-installer --- hamara-sugam.conf | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) mode change 100644 => 100755 hamara-sugam.conf diff --git a/hamara-sugam.conf b/hamara-sugam.conf old mode 100644 new mode 100755 index 578ccf6..eea09e4 --- a/hamara-sugam.conf +++ b/hamara-sugam.conf @@ -1,20 +1,22 @@ +MIRROR=in.devel.hamaralinux.org + lb config --apt apt \ --apt-indices true \ - --apt-recommends true + --apt-recommends true \ --apt-secure true \ --archive-areas "main contrib non-free" \ + --backports false \ --binary-images iso-hybrid \ --bootloaders syslinux,grub-efi \ --compression gzip \ - --debian-installer live \ + --debian-installer false \ --debian-installer-distribution namaste \ - --debian-installer-gui true \ + --debian-installer-gui false \ --debootstrap-options "--keyring=/usr/share/keyrings/hamara-archive-keyring.gpg" \ --distribution namaste \ - --parent-distribution namaste \ - --parent-debian-installer-distribution namaste \ --firmware-binary true \ --firmware-chroot true \ + --hdd-label Hamara_Sugam_Live \ --initramfs live-boot \ --initsystem systemd \ --iso-application Hamara Sugam \ @@ -23,31 +25,21 @@ lb config --apt apt \ --keyring-packages hamara-keyring \ --linux-packages linux-image \ --memtest memtest86 \ - --parent-mirror-bootstrap http://in.devel.hamaralinux.org/hamara-sugam \ - --parent-mirror-chroot http://in.devel.hamaralinux.org/hamara-sugam \ + --parent-debian-installer-distribution namaste \ + --parent-mirror-bootstrap http://$MIRROR/hamara-sugam \ + --parent-mirror-chroot http://$MIRROR/hamara-sugam \ --parent-mirror-chroot-security http://security.debian.org \ - --parent-mirror-chroot-updates http://in.devel.hamaralinux.org/hamara-sugam \ - --parent-mirror-chroot-backports http://in.devel.hamaralinux.org/hamara-sugam \ - --parent-mirror-binary http://in.devel.hamaralinux.org/hamara-sugam \ + --parent-mirror-binary http://$MIRROR/hamara-sugam \ --parent-mirror-binary-security http://security.debian.org \ - --parent-mirror-binary-updates http://in.devel.hamaralinux.org/hamara-sugam \ - --parent-mirror-binary-backports http://in.devel.hamaralinux.org/hamara-sugam \ - --parent-mirror-debian-installer http://in.devel.hamaralinux.org/hamara-sugam \ - --mirror-bootstrap http://in.devel.hamaralinux.org/hamara-sugam \ - --mirror-chroot http://in.devel.hamaralinux.org/hamara-sugam \ + --parent-mirror-debian-installer http://$MIRROR/hamara-sugam \ + --mirror-bootstrap http://$MIRROR/hamara-sugam \ + --mirror-chroot http://$MIRROR/hamara-sugam \ --mirror-chroot-security http://security.debian.org \ - --mirror-chroot-updates http://in.devel.hamaralinux.org/hamara-sugam \ - --mirror-chroot-backports http://in.devel.hamaralinux.org/hamara-sugam \ - --mirror-binary http://in.devel.hamaralinux.org/hamara-sugam \ + --mirror-binary http://$MIRROR/hamara-sugam \ --mirror-binary-security http://security.debian.org \ - --mirror-binary-updates http://in.devel.hamaralinux.org/hamara-sugam \ - --mirror-binary-backports http://in.devel.hamaralinux.org/hamara-sugam \ - --mirror-debian-installer http://in.devel.hamaralinux.org/hamara-sugam \ - + --mirror-debian-installer http://$MIRROR/hamara-sugam \ --mode debian \ - --system live \ --source-images iso \ - --hdd-label Hamara_Sugam_Live \ - --security false \ - --updates false \ - --backports false + --system live \ + --security true \ + --updates true -- 2.17.1 From 5d33102100aa1ef94db988b6a6497aa7b256cb21 Mon Sep 17 00:00:00 2001 From: isaagar Date: Thu, 1 Feb 2018 18:35:54 +0530 Subject: [PATCH 3/4] remove hamara config files and its modified debian-installer lb script update package list of hamara-sugam --- .../config/package-lists/desktop.list.chroot | 5 +- .../package-lists/live-systems.list.chroot | 2 - .../config/package-lists/live.list.chroot | 2 + config.d/hamara/config/binary | 158 ---- config.d/hamara/config/bootstrap | 73 -- config.d/hamara/config/build | 10 - config.d/hamara/config/chroot | 37 - config.d/hamara/config/common | 119 --- .../live/0010-disable-kexec-tools.hook.chroot | 1 - .../0050-disable-sysvinit-tmpfs.hook.chroot | 1 - ...0070-set-plymouth-hamara-theme.hook.chroot | 11 - .../hooks/live/0090-get-cala.hook.chroot | 12 - .../0020-create-mtab-symlink.hook.chroot | 1 - .../normal/0030-enable-cryptsetup.hook.chroot | 1 - .../0040-create-locales-files.hook.chroot | 1 - ...0-remove-adjtime-configuration.hook.chroot | 1 - .../0110-remove-backup-files.hook.chroot | 1 - .../0120-remove-dbus-machine-id.hook.chroot | 1 - .../0130-remove-gnome-icon-cache.hook.chroot | 1 - .../normal/0140-remove-log-files.hook.chroot | 1 - ...150-remove-mdadm-configuration.hook.chroot | 1 - ...emove-openssh-server-host-keys.hook.chroot | 1 - .../normal/0170-remove-python-py.hook.chroot | 1 - ...0180-remove-systemd-machine-id.hook.chroot | 1 - .../0190-remove-temporary-files.hook.chroot | 1 - .../0195-remove-ssl-cert-snakeoil.hook.chroot | 1 - ...emove-udev-persistent-cd-rules.hook.chroot | 1 - ...move-udev-persistent-net-rules.hook.chroot | 1 - .../0400-update-apt-file-cache.hook.chroot | 1 - .../0410-update-apt-xapian-index.hook.chroot | 1 - .../0420-update-glx-alternative.hook.chroot | 1 - .../0430-update-mlocate-database.hook.chroot | 1 - ...0440-update-nvidia-alternative.hook.chroot | 1 - .../package-lists/additional.list.chroot | 5 +- config.d/hamara/config/source | 9 - .../lb_scripts/installer_debian-installer | 829 ------------------ 36 files changed, 7 insertions(+), 1288 deletions(-) delete mode 100644 config.d/hamara-sugam/config/package-lists/live-systems.list.chroot delete mode 100644 config.d/hamara/config/binary delete mode 100644 config.d/hamara/config/bootstrap delete mode 100644 config.d/hamara/config/build delete mode 100644 config.d/hamara/config/chroot delete mode 100644 config.d/hamara/config/common delete mode 120000 config.d/hamara/config/hooks/live/0010-disable-kexec-tools.hook.chroot delete mode 120000 config.d/hamara/config/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot delete mode 100644 config.d/hamara/config/hooks/live/0070-set-plymouth-hamara-theme.hook.chroot delete mode 100644 config.d/hamara/config/hooks/live/0090-get-cala.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0020-create-mtab-symlink.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0030-enable-cryptsetup.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0040-create-locales-files.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0100-remove-adjtime-configuration.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0110-remove-backup-files.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0120-remove-dbus-machine-id.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0130-remove-gnome-icon-cache.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0140-remove-log-files.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0150-remove-mdadm-configuration.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0170-remove-python-py.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0180-remove-systemd-machine-id.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0190-remove-temporary-files.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0195-remove-ssl-cert-snakeoil.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0200-remove-udev-persistent-cd-rules.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0300-remove-udev-persistent-net-rules.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0400-update-apt-file-cache.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0410-update-apt-xapian-index.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0420-update-glx-alternative.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0430-update-mlocate-database.hook.chroot delete mode 120000 config.d/hamara/config/hooks/normal/0440-update-nvidia-alternative.hook.chroot delete mode 100644 config.d/hamara/config/source delete mode 100755 data/hamara/lb_scripts/installer_debian-installer diff --git a/config.d/hamara-sugam/config/package-lists/desktop.list.chroot b/config.d/hamara-sugam/config/package-lists/desktop.list.chroot index e4b7d3a..14a4ab8 100644 --- a/config.d/hamara-sugam/config/package-lists/desktop.list.chroot +++ b/config.d/hamara-sugam/config/package-lists/desktop.list.chroot @@ -7,13 +7,10 @@ mate-dock-applet mate-menu network-manager-gnome network-manager-openvpn -#paper-gtk-theme paper-icon-theme plymouth-theme-hamara grub-theme-hamara source-sans-pro materia-gtk-theme - - grub2 -grub-pc \ No newline at end of file +grub-pc diff --git a/config.d/hamara-sugam/config/package-lists/live-systems.list.chroot b/config.d/hamara-sugam/config/package-lists/live-systems.list.chroot deleted file mode 100644 index d73ed96..0000000 --- a/config.d/hamara-sugam/config/package-lists/live-systems.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -live-manual -live-tools diff --git a/config.d/hamara-sugam/config/package-lists/live.list.chroot b/config.d/hamara-sugam/config/package-lists/live.list.chroot index 1e6ef96..3bcf51f 100644 --- a/config.d/hamara-sugam/config/package-lists/live.list.chroot +++ b/config.d/hamara-sugam/config/package-lists/live.list.chroot @@ -1,3 +1,5 @@ live-boot live-config live-config-systemd +live-manual +live-tools diff --git a/config.d/hamara/config/binary b/config.d/hamara/config/binary deleted file mode 100644 index 0b6b47e..0000000 --- a/config.d/hamara/config/binary +++ /dev/null @@ -1,158 +0,0 @@ -# config/binary - options for live-build(7), binary stage - -# $LB_BINARY_FILESYSTEM: set image filesystem -# (Default: fat32) -LB_BINARY_FILESYSTEM="fat32" - -# $LB_APT_INDICES: set apt/aptitude generic indices -# (Default: true) -LB_APT_INDICES="false" - -# $LB_BOOTAPPEND_LIVE: set boot parameters -# (Default: empty) -LB_BOOTAPPEND_LIVE="boot=live components quiet splash" - -# $LB_BOOTAPPEND_INSTALL: set boot parameters -# (Default: empty) -LB_BOOTAPPEND_INSTALL="" - -# $LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters -# (Default: empty) -LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" - -# $LB_BOOTLOADERS: set bootloaders -# (Default: grub-pc) -LB_BOOTLOADERS="syslinux,grub-efi" - -# $LB_CHECKSUMS: set checksums -# (Default: md5) -LB_CHECKSUMS="md5" - -# $LB_COMPRESSION: set compression -# (Default: none) -LB_COMPRESSION="gzip" - -# $LB_ZSYNC: set zsync -# (Default: false) -LB_ZSYNC="false" - -# ${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted -# (Default: true) -# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false. -LB_BUILD_WITH_CHROOT="true" - -# $LB_DEBIAN_INSTALLER: set debian-installer -# (Default: true) -LB_DEBIAN_INSTALLER="live" - -# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite -# (Default: empty) -LB_DEBIAN_INSTALLER_DISTRIBUTION="namaste" - -# $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url -# (Default: ) -LB_DEBIAN_INSTALLER_PRESEEDFILE="" - -# $LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer -# (Default: true) -LB_DEBIAN_INSTALLER_GUI="true" - -# $LB_GRUB_SPLASH: set custom grub splash -# (Default: empty) -LB_GRUB_SPLASH="" - -# $LB_HDD_LABEL: set hdd label -# (Default: DEBIAN_LIVE) -LB_HDD_LABEL="HAMARA_LIVE" - -# $LB_HDD_SIZE: set hdd filesystem size -# (Default: auto) -LB_HDD_SIZE="auto" - -# $LB_HDD_PARTITION_START: set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout. -# (Default: ) -LB_HDD_PARTITION_START="" - -# $LB_ISO_APPLICATION: set iso author -# (Default: Debian Live) -LB_ISO_APPLICATION="Hamara Live" - -# $LB_ISO_PREPARER: set iso preparer -# (Default: live-build 1:20161216; http://live-systems.org/devel/live-build) -LB_ISO_PREPARER="live-build 1:20161216; http://live-systems.org/devel/live-build" - -# $LB_ISO_PUBLISHER: set iso publisher -# (Default: Live Systems project; http://live-systems.org/; debian-live@lists.debian.org) -LB_ISO_PUBLISHER="Live Systems project; http://live-systems.org/; debian-live@lists.debian.org" - -# $LB_ISO_VOLUME: set iso volume (max 32 chars) -# (Default: Debian stretch 20170104-14:07) -LB_ISO_VOLUME="Hamara Svastik 2.0 20171013" - -# $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size -# (Default: unset) -LB_JFFS2_ERASEBLOCK="" - -# $LB_MEMTEST: set memtest -# (Default: none) -LB_MEMTEST="" - -# $LB_LOADLIN: set loadlin -# (Default: false) -LB_LOADLIN="false" - -# $LB_WIN32_LOADER: set win32-loader -# (Default: false) -LB_WIN32_LOADER="false" - -# $LB_NET_ROOT_FILESYSTEM: set netboot filesystem -# (Default: nfs) -LB_NET_ROOT_FILESYSTEM="nfs" - -# $LB_NET_ROOT_MOUNTOPTIONS: set nfsopts -# (Default: empty) -LB_NET_ROOT_MOUNTOPTIONS="" - -# $LB_NET_ROOT_PATH: set netboot server directory -# (Default: /srv/debian-live) -LB_NET_ROOT_PATH="/srv/debian-live" - -# $LB_NET_ROOT_SERVER: set netboot server address -# (Default: 192.168.1.1) -LB_NET_ROOT_SERVER="192.168.1.1" - -# $LB_NET_COW_FILESYSTEM: set net client cow filesystem -# (Default: nfs) -LB_NET_COW_FILESYSTEM="nfs" - -# $LB_NET_COW_MOUNTOPTIONS: set cow mount options -# (Default: empty) -LB_NET_COW_MOUNTOPTIONS="" - -# $LB_NET_COW_PATH: set cow directory -# (Default: ) -LB_NET_COW_PATH="" - -# $LB_NET_COW_SERVER: set cow server -# (Default: ) -LB_NET_COW_SERVER="" - -# $LB_NET_TARBALL: set net tarball -# (Default: true) -LB_NET_TARBALL="true" - -# $LB_FIRMWARE_BINARY: include firmware packages in debian-installer -# (Default: true) -LB_FIRMWARE_BINARY="true" - -# $LB_FIRMWARE_CHROOT: include firmware packages in debian-installer -# (Default: true) -LB_FIRMWARE_CHROOT="true" - -# $LB_SWAP_FILE_PATH: set swap file path -# (Default: ) -LB_SWAP_FILE_PATH="" - -# $LB_SWAP_FILE_SIZE: set swap file size -# (Default: 512) -LB_SWAP_FILE_SIZE="512" diff --git a/config.d/hamara/config/bootstrap b/config.d/hamara/config/bootstrap deleted file mode 100644 index 15a94b8..0000000 --- a/config.d/hamara/config/bootstrap +++ /dev/null @@ -1,73 +0,0 @@ -# config/bootstrap - options for live-build(7), bootstrap stage - -# $LB_DISTRIBUTION: select distribution to use -# (Default: svastik) -LB_DISTRIBUTION="svastik" - -# $LB_PARENT_DISTRIBUTION: select parent distribution to use -# (Default: svastik) -LB_PARENT_DISTRIBUTION="svastik" - -# $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use -# (Default: svastik) -LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="svastik" - -# $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_PARENT_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara" - -# $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_PARENT_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara" - -# $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from -# (Default: http://security.debian.org/) -LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/" - -# $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_PARENT_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara" - -# $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_PARENT_MIRROR_BINARY_SECURITY="http://in.devel.hamaralinux.org/hamara" - -# $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara" - -# $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara" - -# $LB_MIRROR_CHROOT: set mirror to fetch packages from -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara" - -# $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from -# (Default: http://security.debian.org/) -LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/" - -# $LB_MIRROR_BINARY: set mirror which ends up in the image -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara" - -# $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image -# (Default: http://security.debian.org/) -LB_MIRROR_BINARY_SECURITY="http://security.debian.org/" - -# $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror -# (Default: http://in.devel.hamaralinux.org/hamara) -LB_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara" - -# $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap -# (Default: ) -LB_BOOTSTRAP_QEMU_ARCHITECTURES="" - -# $LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap -# (Default: ) -LB_BOOTSTRAP_QEMU_EXCLUDE="" - -# $LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap -# (Default: ) -LB_BOOTSTRAP_QEMU_STATIC="" diff --git a/config.d/hamara/config/build b/config.d/hamara/config/build deleted file mode 100644 index cd9b8a6..0000000 --- a/config.d/hamara/config/build +++ /dev/null @@ -1,10 +0,0 @@ -[Image] -Architecture: amd64 -Archive-Areas: main contrib non-free -Distribution: svastik -Mirror-Bootstrap: http://devel.hamaralinux.org/hamara - -[FIXME] -Configuration-Version: 1:20171013 -Name: hamara-svastik-live -Type: iso-hybrid diff --git a/config.d/hamara/config/chroot b/config.d/hamara/config/chroot deleted file mode 100644 index ad37338..0000000 --- a/config.d/hamara/config/chroot +++ /dev/null @@ -1,37 +0,0 @@ -# config/chroot - options for live-build(7), chroot stage - -# $LB_CHROOT_FILESYSTEM: set chroot filesystem -# (Default: squashfs) -LB_CHROOT_FILESYSTEM="squashfs" - -# $LB_UNION_FILESYSTEM: set union filesystem -# (Default: overlay) -LB_UNION_FILESYSTEM="overlay" - -# $LB_INTERACTIVE: set interactive build -# (Default: false) -LB_INTERACTIVE="false" - -# $LB_KEYRING_PACKAGES: set keyring packages -# (Default: empty) -LB_KEYRING_PACKAGES="hamara-keyring" - -# $LB_LINUX_FLAVOURS: set kernel flavour to use -# (Default: autodetected) -LB_LINUX_FLAVOURS="" - -# $LB_LINUX_PACKAGES: set kernel packages to use -# (Default: autodetected) -LB_LINUX_PACKAGES="linux-image" - -# $LB_SECURITY: enable security updates -# (Default: false) -LB_SECURITY="false" - -# $LB_UPDATES: enable updates updates -# (Default: false) -LB_UPDATES="false" - -# $LB_BACKPORTS: enable backports updates -# (Default: false) -LB_BACKPORTS="false" diff --git a/config.d/hamara/config/common b/config.d/hamara/config/common deleted file mode 100644 index b7d56a7..0000000 --- a/config.d/hamara/config/common +++ /dev/null @@ -1,119 +0,0 @@ -# config/common - common options for live-build(7) - -# $LB_APT: set package manager -# (Default: apt) -LB_APT="apt" - -# $LB_APT_FTP_PROXY: set apt/aptitude ftp proxy -# (Default: autodetected or empty) -LB_APT_FTP_PROXY="" - -# $LB_APT_HTTP_PROXY: set apt/aptitude http proxy -# (Default: autodetected or empty) -LB_APT_HTTP_PROXY="" - -# $LB_APT_PIPELINE: set apt/aptitude pipeline depth -# (Default: ) -LB_APT_PIPELINE="" - -# $LB_APT_RECOMMENDS: set apt/aptitude recommends -# (Default: true) -LB_APT_RECOMMENDS="true" - -# $LB_APT_SECURE: set apt/aptitude security -# (Default: true) -LB_APT_SECURE="true" - -# $LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list -# (Default: true) -LB_APT_SOURCE_ARCHIVES="false" - -# $LB_CACHE: control cache -# (Default: true) -LB_CACHE="true" - -# $LB_CACHE_INDICES: control if downloaded package indices should be cached -# (Default: false) -LB_CACHE_INDICES="false" - -# $LB_CACHE_PACKAGES: control if downloaded packages files should be cached -# (Default: true) -LB_CACHE_PACKAGES="true" - -# $LB_CACHE_STAGES: control if completed stages should be cached -# (Default: bootstrap) -LB_CACHE_STAGES="bootstrap" - -# $LB_DEBCONF_FRONTEND: set debconf(1) frontend to use -# (Default: noninteractive) -LB_DEBCONF_FRONTEND="noninteractive" - -# $LB_DEBCONF_PRIORITY: set debconf(1) priority to use -# (Default: critical) -LB_DEBCONF_PRIORITY="critical" - -# $LB_INITRAMFS: set initramfs hook -# (Default: live-boot) -LB_INITRAMFS="live-boot" - -# $LB_INITRAMFS_COMPRESSION: set initramfs compression -# (Default: gzip) -LB_INITRAMFS_COMPRESSION="gzip" - -# $LB_INITSYSTEM: set init system -# (Default: systemd) -LB_INITSYSTEM="systemd" - -# $LB_FDISK: set fdisk program -# (Default: autodetected) -LB_FDISK="fdisk" - -# $LB_LOSETUP: set losetup program -# (Default: autodetected) -LB_LOSETUP="losetup" - -# $LB_MODE: set distribution mode -# (Default: debian) -LB_MODE="debian" - -# $LB_SYSTEM: set system type -# (Default: live) -LB_SYSTEM="live" - -# $LB_TASKSEL: set tasksel program -# (Default: apt) -LB_TASKSEL="apt" - -# live-build options - -# $_BREAKPOINTS: enable breakpoints -# (Default: false) -#_BREAKPOINTS="false" - -# $_DEBUG: enable debug -# (Default: false) -#_DEBUG="false" - -# $_COLOR: enable color -# (Default: false) -#_COLOR="false" - -# $_FORCE: enable force -# (Default: false) -#_FORCE="false" - -# $_QUIET: enable quiet -# (Default: false) -_QUIET="false" - -# $_VERBOSE: enable verbose -# (Default: false) -#_VERBOSE="false" - -# Internal stuff (FIXME) -APT_OPTIONS="--yes" -APTITUDE_OPTIONS="--assume-yes" -DEBOOTSTRAP_OPTIONS="--no-check-gpg" -DEBOOTSTRAP_SCRIPT="" -GZIP_OPTIONS="-6 --rsyncable" -ISOHYBRID_OPTIONS="" diff --git a/config.d/hamara/config/hooks/live/0010-disable-kexec-tools.hook.chroot b/config.d/hamara/config/hooks/live/0010-disable-kexec-tools.hook.chroot deleted file mode 120000 index 996f766..0000000 --- a/config.d/hamara/config/hooks/live/0010-disable-kexec-tools.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/live/0010-disable-kexec-tools.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot b/config.d/hamara/config/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot deleted file mode 120000 index 5ddf090..0000000 --- a/config.d/hamara/config/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/live/0070-set-plymouth-hamara-theme.hook.chroot b/config.d/hamara/config/hooks/live/0070-set-plymouth-hamara-theme.hook.chroot deleted file mode 100644 index 18e9d30..0000000 --- a/config.d/hamara/config/hooks/live/0070-set-plymouth-hamara-theme.hook.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -#set theme to hamara -if [ -e /usr/share/plymouth/themes/hamara ] -then - plymouth-set-default-theme -R hamara -else - exit 0 -fi diff --git a/config.d/hamara/config/hooks/live/0090-get-cala.hook.chroot b/config.d/hamara/config/hooks/live/0090-get-cala.hook.chroot deleted file mode 100644 index 8ac1f62..0000000 --- a/config.d/hamara/config/hooks/live/0090-get-cala.hook.chroot +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -#Hook to pull/inst calamares installer from Debian Unstable during live build. -echo "deb http://ftp.uk.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable.list -apt update -apt install -y calamares calamares-settings-hamara -rm /etc/apt/sources.list.d/unstable.list -apt update - -#reconfigure hamara-live -dpkg-reconfigure hamara-live -apt -y autoremove diff --git a/config.d/hamara/config/hooks/normal/0020-create-mtab-symlink.hook.chroot b/config.d/hamara/config/hooks/normal/0020-create-mtab-symlink.hook.chroot deleted file mode 120000 index 58123fc..0000000 --- a/config.d/hamara/config/hooks/normal/0020-create-mtab-symlink.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0020-create-mtab-symlink.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0030-enable-cryptsetup.hook.chroot b/config.d/hamara/config/hooks/normal/0030-enable-cryptsetup.hook.chroot deleted file mode 120000 index c5ab625..0000000 --- a/config.d/hamara/config/hooks/normal/0030-enable-cryptsetup.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0030-enable-cryptsetup.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0040-create-locales-files.hook.chroot b/config.d/hamara/config/hooks/normal/0040-create-locales-files.hook.chroot deleted file mode 120000 index 036e7e0..0000000 --- a/config.d/hamara/config/hooks/normal/0040-create-locales-files.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0040-create-locales-files.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0100-remove-adjtime-configuration.hook.chroot b/config.d/hamara/config/hooks/normal/0100-remove-adjtime-configuration.hook.chroot deleted file mode 120000 index b0ccdb6..0000000 --- a/config.d/hamara/config/hooks/normal/0100-remove-adjtime-configuration.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0100-remove-adjtime-configuration.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0110-remove-backup-files.hook.chroot b/config.d/hamara/config/hooks/normal/0110-remove-backup-files.hook.chroot deleted file mode 120000 index 8b68c5c..0000000 --- a/config.d/hamara/config/hooks/normal/0110-remove-backup-files.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0110-remove-backup-files.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0120-remove-dbus-machine-id.hook.chroot b/config.d/hamara/config/hooks/normal/0120-remove-dbus-machine-id.hook.chroot deleted file mode 120000 index 4d55b27..0000000 --- a/config.d/hamara/config/hooks/normal/0120-remove-dbus-machine-id.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0120-remove-dbus-machine-id.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0130-remove-gnome-icon-cache.hook.chroot b/config.d/hamara/config/hooks/normal/0130-remove-gnome-icon-cache.hook.chroot deleted file mode 120000 index 54f6a9b..0000000 --- a/config.d/hamara/config/hooks/normal/0130-remove-gnome-icon-cache.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0130-remove-gnome-icon-cache.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0140-remove-log-files.hook.chroot b/config.d/hamara/config/hooks/normal/0140-remove-log-files.hook.chroot deleted file mode 120000 index 2b99cec..0000000 --- a/config.d/hamara/config/hooks/normal/0140-remove-log-files.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0140-remove-log-files.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0150-remove-mdadm-configuration.hook.chroot b/config.d/hamara/config/hooks/normal/0150-remove-mdadm-configuration.hook.chroot deleted file mode 120000 index 0c3cd2f..0000000 --- a/config.d/hamara/config/hooks/normal/0150-remove-mdadm-configuration.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0150-remove-mdadm-configuration.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot b/config.d/hamara/config/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot deleted file mode 120000 index e57b8d2..0000000 --- a/config.d/hamara/config/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0170-remove-python-py.hook.chroot b/config.d/hamara/config/hooks/normal/0170-remove-python-py.hook.chroot deleted file mode 120000 index 858a942..0000000 --- a/config.d/hamara/config/hooks/normal/0170-remove-python-py.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0170-remove-python-py.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0180-remove-systemd-machine-id.hook.chroot b/config.d/hamara/config/hooks/normal/0180-remove-systemd-machine-id.hook.chroot deleted file mode 120000 index 6cecf66..0000000 --- a/config.d/hamara/config/hooks/normal/0180-remove-systemd-machine-id.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0180-remove-systemd-machine-id.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0190-remove-temporary-files.hook.chroot b/config.d/hamara/config/hooks/normal/0190-remove-temporary-files.hook.chroot deleted file mode 120000 index ada76d9..0000000 --- a/config.d/hamara/config/hooks/normal/0190-remove-temporary-files.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0190-remove-temporary-files.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0195-remove-ssl-cert-snakeoil.hook.chroot b/config.d/hamara/config/hooks/normal/0195-remove-ssl-cert-snakeoil.hook.chroot deleted file mode 120000 index 9fc0723..0000000 --- a/config.d/hamara/config/hooks/normal/0195-remove-ssl-cert-snakeoil.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0195-remove-ssl-cert-snakeoil.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0200-remove-udev-persistent-cd-rules.hook.chroot b/config.d/hamara/config/hooks/normal/0200-remove-udev-persistent-cd-rules.hook.chroot deleted file mode 120000 index f893dcc..0000000 --- a/config.d/hamara/config/hooks/normal/0200-remove-udev-persistent-cd-rules.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0200-remove-udev-persistent-cd-rules.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0300-remove-udev-persistent-net-rules.hook.chroot b/config.d/hamara/config/hooks/normal/0300-remove-udev-persistent-net-rules.hook.chroot deleted file mode 120000 index a6ee33d..0000000 --- a/config.d/hamara/config/hooks/normal/0300-remove-udev-persistent-net-rules.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0300-remove-udev-persistent-net-rules.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0400-update-apt-file-cache.hook.chroot b/config.d/hamara/config/hooks/normal/0400-update-apt-file-cache.hook.chroot deleted file mode 120000 index 380fdcf..0000000 --- a/config.d/hamara/config/hooks/normal/0400-update-apt-file-cache.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0400-update-apt-file-cache.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0410-update-apt-xapian-index.hook.chroot b/config.d/hamara/config/hooks/normal/0410-update-apt-xapian-index.hook.chroot deleted file mode 120000 index dd7150e..0000000 --- a/config.d/hamara/config/hooks/normal/0410-update-apt-xapian-index.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0410-update-apt-xapian-index.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0420-update-glx-alternative.hook.chroot b/config.d/hamara/config/hooks/normal/0420-update-glx-alternative.hook.chroot deleted file mode 120000 index 4da25f8..0000000 --- a/config.d/hamara/config/hooks/normal/0420-update-glx-alternative.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0420-update-glx-alternative.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0430-update-mlocate-database.hook.chroot b/config.d/hamara/config/hooks/normal/0430-update-mlocate-database.hook.chroot deleted file mode 120000 index 13b49d7..0000000 --- a/config.d/hamara/config/hooks/normal/0430-update-mlocate-database.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0430-update-mlocate-database.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/hooks/normal/0440-update-nvidia-alternative.hook.chroot b/config.d/hamara/config/hooks/normal/0440-update-nvidia-alternative.hook.chroot deleted file mode 120000 index 0a65196..0000000 --- a/config.d/hamara/config/hooks/normal/0440-update-nvidia-alternative.hook.chroot +++ /dev/null @@ -1 +0,0 @@ -/usr/share/live/build/hooks/normal/0440-update-nvidia-alternative.hook.chroot \ No newline at end of file diff --git a/config.d/hamara/config/package-lists/additional.list.chroot b/config.d/hamara/config/package-lists/additional.list.chroot index d1d51bc..5ce3eb0 100644 --- a/config.d/hamara/config/package-lists/additional.list.chroot +++ b/config.d/hamara/config/package-lists/additional.list.chroot @@ -10,7 +10,7 @@ bluetooth brltty cheese cups -firefox +#firefox gparted gnome-disk-utility gnome-orca @@ -69,3 +69,6 @@ xserver-xorg-input-synaptics xserver-xorg-input-multitouch xserver-xorg xserver-common + +#Add keyring package +hamara-keyring diff --git a/config.d/hamara/config/source b/config.d/hamara/config/source deleted file mode 100644 index 93a022a..0000000 --- a/config.d/hamara/config/source +++ /dev/null @@ -1,9 +0,0 @@ -# config/source - options for live-build(7), source stage - -# $LB_SOURCE: set source option -# (Default: false) -LB_SOURCE="false" - -# $LB_SOURCE_IMAGES: set image type -# (Default: tar) -LB_SOURCE_IMAGES="tar" diff --git a/data/hamara/lb_scripts/installer_debian-installer b/data/hamara/lb_scripts/installer_debian-installer deleted file mode 100755 index 41985cd..0000000 --- a/data/hamara/lb_scripts/installer_debian-installer +++ /dev/null @@ -1,829 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2015 Daniel Baumann -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'install debian-installer into binary')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -if [ "${_DEBUG}" = "true" ] -then - WGET_OPTIONS="${WGET_OPTIONS} --verbose" -elif [ "${_QUIET}" = "true" ] -then - WGET_OPTIONS="${WGET_OPTIONS} --quiet" -else - WGET_OPTIONS="${WGET_OPTIONS} --no-verbose" -fi - -# Check d-i configuration -case "${LB_DEBIAN_INSTALLER}" in - true|cdrom|netinst|netboot|businesscard|live) - ;; - - false) - exit 0 - ;; - - *) - Echo_error "debian-installer flavour %s not supported." "${LB_DEBIAN_INSTALLER}" - exit 1 - ;; -esac - -Echo_message "Begin installing debian-installer..." - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/installer_debian-installer - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Checking depends -Check_package host /usr/bin/wget wget -Check_package chroot /usr/bin/apt-ftparchive apt-utils - -# Restoring cache -Restore_cache cache/packages.binary - -# Installing depends -Install_package - -# Setting destination directory -case "${LIVE_IMAGE_TYPE}" in - netboot) - DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}" - ;; - - hdd*|tar) - DESTDIR="binary/install" - ;; - - *) - DESTDIR="binary/install" - ;; -esac - -# Set d-i image type -case "${LB_DEBIAN_INSTALLER}" in - businesscard|netboot|netinst) - DI_IMAGE_TYPE="netboot" - ;; - *) - case "${LIVE_IMAGE_TYPE}" in - netboot) - DI_IMAGE_TYPE="netboot" - ;; - - *) - DI_IMAGE_TYPE="cdrom" - ;; - esac - ;; -esac - -# Set architecture-specific variables -case "${LB_ARCHITECTURES}" in - armel) - DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')" - case "${DI_IMAGE_TYPE}" in - cdrom) - DI_REMOTE_BASE="${DEFAULT_FLAVOUR}/cdrom" - ;; - - netboot) - DI_REMOTE_BASE="${DEFAULT_FLAVOUR}/netboot" - ;; - esac - - DI_REMOTE_KERNEL="vmlinuz" - DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk" - ;; - - powerpc) - case "${DI_IMAGE_TYPE}" in - cdrom) - DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom" - ;; - - netboot) - DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot" - ;; - esac - - DI_REMOTE_KERNEL="vmlinux" - DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk" - ;; - - *) - case "${DI_IMAGE_TYPE}" in - netboot) - DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURES}" - DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURES}" - DI_REMOTE_KERNEL="linux" - ;; - - cdrom) - DI_REMOTE_BASE="cdrom" - DI_REMOTE_BASE_GTK="cdrom/gtk" - DI_REMOTE_KERNEL="vmlinuz" - ;; - esac - ;; -esac - -Check_multiarchitectures - -Install_file() { - local FILE - FILE="${1}" - - local ARCHIVE_AREA - ARCHIVE_AREA="$(dpkg -I ${FILE} | awk '/^.*Section: / { print $2 }')" - - if echo "${ARCHIVE_AREA}" | grep -qs '/' - then - ARCHIVE_AREA="$(echo ${ARCHIVE_AREA} | awk -F/ '{ print $1 }')" - else - ARCHIVE_AREA="main" - fi - - local TARGET - TARGET="${2}/${ARCHIVE_AREA}" - - SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')" - - if [ -z "${SOURCE}" ] - then - SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')" - fi - - case "${SOURCE}" in - lib?*) - LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')" - ;; - - *) - LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')" - ;; - esac - - # Install directory - mkdir -p "${TARGET}"/"${LETTER}"/"${SOURCE}" - - # Move files - cp "${FILE}" "${TARGET}"/"${LETTER}"/"${SOURCE}" -} - -# Set absolute directory for caching; we require it when we call Download_file -# from a non-standard cwd. -_LB_CACHE_DIR="$(pwd)/cache/installer_debian-installer" - -Download_file () { - local _LB_TARGET - _LB_TARGET="${1}" - - local _LB_URL - _LB_URL="${2}" - - _LB_CACHE_FILE="${_LB_CACHE_DIR}/$(echo "$_LB_URL" | sed 's|/|_|g')" - - if [ ! -f "${_LB_CACHE_FILE}" ] - then - mkdir -p ${_LB_CACHE_DIR} - if ! wget ${WGET_OPTIONS} -O "${_LB_CACHE_FILE}" "${_LB_URL}" - then - rm -f "${_LB_CACHE_FILE}" - - Echo_error "Could not download file: %s" "${_LB_URL}" - exit 1 - fi - fi - - if [ "$(stat --printf %d "${_LB_CACHE_DIR}/")" = "$(stat --printf %d ./)" ] - then - CP_OPTIONS="-l" - fi - - cp -f ${CP_OPTIONS} -- "${_LB_CACHE_FILE}" "${_LB_TARGET}" -} - -VMLINUZ_DI="vmlinuz" -INITRD_DI="initrd.gz" -DESTDIR_DI="${DESTDIR}" - -VMLINUZ_GI="gtk/vmlinuz" -INITRD_GI="gtk/initrd.gz" -DESTDIR_GI="${DESTDIR}/gtk" - -case "${LB_DERIVATIVE}" in - false) - if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] - then - # FIXME: variable name should be decupled from derivatves - LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DISTRIBUTION}" - - # Debian Installer daily builds - URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" - else - URL="http://in.devel.hamaralinux.org/debian-installer/installer-${LB_ARCHITECTURES}/current/images/" - fi - ;; - - true) - if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] - then - LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DISTRIBUTION}" - - # Debian Installer daily builds - URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" - else - URL="http://in.devel.hamaralinux.org/debian-installer/installer-${LB_ARCHITECTURES}/current/images/" - fi - - if [ "${LB_MODE}" = "progress-linux" ] - then - # FIXME: normal derivatives probably don't rebuild d-i, - # but progress-linux does. - URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/stretch/main/installer-${LB_ARCHITECTURES}/current/images/" - fi - ;; -esac - -mkdir -p "${DESTDIR_DI}" - -# Downloading debian-installer -Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL} -Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz - -# Downloading graphical-installer -DOWNLOAD_GTK_INSTALLER=0 -if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ] -then - case "${LB_ARCHITECTURES}" in - amd64|i386) - DOWNLOAD_GTK_INSTALLER=1 - ;; - - powerpc) - if [ "${LB_DEBIAN_INSTALLER}" = "netboot" ] - then - DOWNLOAD_GTK_INSTALLER=1 - fi - ;; - esac -fi - -if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ] -then - mkdir -p "${DESTDIR_GI}" - Download_file "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} - Download_file "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz -fi - -# Only download additional packages if appropriate -if [ "${DI_IMAGE_TYPE}" != "netboot" ] -then - # Downloading additional packages - mkdir -p chroot/binary.deb/archives/partial - - mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp - touch chroot/var/lib/dpkg/status - - case "${LB_ARCHITECTURES}" in - amd64) - DI_REQ_PACKAGES="lilo grub-pc" - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64" - ;; - - i386) - DI_REQ_PACKAGES="lilo grub-pc" - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-686-pae" - ;; - - powerpc) - DI_REQ_PACKAGES="yaboot" - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp" - ;; - esac - - DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2 xfsprogs jfsutils" - - case "${LB_MODE}" in - debian) - DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd" - DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd" - ;; - esac - # Include firmware packages - if [ "${LB_FIRMWARE_BINARY}" = "true" ] - then - # Assumption: firmware packages install files into /lib/firmware - - # Get all firmware packages names - mkdir -p cache/contents.binary - - FIRMWARE_PACKAGES="" - - _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" - - rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} - - for _CONTENT in ${_CONTENTS} - do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} - - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" - done - - if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" - then - # Manually add firmware-linux/non-free meta package - if [ "${LB_DERIVATIVE}" != "true" ] - then - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" - else - case "${LB_DERIVATIVE_IS_BASED_ON}" in - debian) - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" - ;; - *) - ;; - esac - fi - fi - - if [ "${LB_DERIVATIVE}" = "true" ] - then - # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). - - _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" - - rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} - - for _CONTENT in ${_CONTENTS} - do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} - - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" - done - fi - - # Drop section and keep package names only - for _PACKAGE in ${FIRMWARE_PACKAGES} - do - DI_FIRMWARE_PACKAGES="${DI_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | awk -F/ '{ print $NF }')" - done - fi - - # Set apt command prefix - _LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only" - - if [ "${LB_DEBIAN_INSTALLER}" = "live" ] - then - # We don't want to duplicate .debs of packages in binary/pool that are already - # installed to target/ via live-installer. - # - # However, we need to force various packages' inclusion in binary/pool as - # d-i does not support (for example) re-installing grub from target/ - the grub - # .debs must actually exist. - - # Download .debs of the required packages - Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} - - # Drop the packages already installed that d-i doesn't explicitely need - _REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')" - _REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v "^(${_REMAINING_PACKAGES})\$")" - - for _PACKAGE in ${_REMAINING_PACKAGES} - do - rm -f chroot/binary.deb/archives/${_PACKAGE}_*.deb - done - else - # Download .debs of the required packages - Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} - fi - - # Revert dpkg status file - mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status - - mv chroot/binary.deb ./ - - for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}) - do - mkdir -p binary/pool/${_ARCHIVE_AREA} - done - - if Find_files binary.deb/archives/*.deb - then - for FILE in binary.deb/archives/*.deb - do - Install_file "${FILE}" "binary/pool" - done - fi - - if [ "${LB_DEBIAN_INSTALLER}" != "live" ] - then - # Including base debian packages - if ls cache/packages.bootstrap/*.deb > /dev/null 2>&1 - then - for FILE in cache/packages.bootstrap/*.deb - do - Install_file "${FILE}" "binary/pool" - done - else - Echo_error "Could not find packages in cache/packages.bootstrap." - Echo_error "You selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer." - exit 1 - fi - fi - - # Including local debs - if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb - then - for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb - do - if [ -e "${FILE}" ] - then - Install_file "${FILE}" "binary/pool" - fi - done - fi - - if Find_files config/packages.binary/*_all.deb || Find_files config/packages/*_all.deb - then - for FILE in config/packages.binary/*_all.deb config/packages/*_all.deb - do - if [ -e "${FILE}" ] - then - Install_file "${FILE}" "binary/pool" - fi - done - fi - - # Generating deb indices - for _ARCHIVE_AREA in $(cd binary/pool && ls) - do - mkdir -p binary/dists/namaste/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES} - - mv binary chroot/root - echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh - Chroot chroot "sh binary.sh" - rm -f chroot/binary.sh - mv chroot/root/binary ./ - - gzip -9 -c binary/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages.gz - - # Fetching release - Download_file binary/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-"${LB_ARCHITECTURES}"/Release - done - - # Symlink firmware packages to /firmware - if [ -n "${DI_FIRMWARE_PACKAGES}" ] - then - mkdir -p binary/firmware - cd binary/firmware - - for _PACKAGE in ${DI_FIRMWARE_PACKAGES} - do - for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb") - do - ln -sf ${_FILE} ./ - done - done - - cd "${OLDPWD}" - fi - - # Udeb handling - mkdir binary.udeb - cd binary.udeb - - # Downloading udeb indices - Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/${LB_DISTRIBUTION}/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz - gunzip -c Packages.gz > Packages -#commenting below so that udebs will be downloaded from sid instead of hamara -# if [ "${LB_DERIVATIVE}" = "true" ] -# then - Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/${LB_DISTRIBUTION}/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz - gunzip -c Packages.derivative.gz > Packages.derivative -# fi - - # Sorting udebs - if [ "${LB_DERIVATIVE}" = true ] - then - UDEBS="$(awk '/Filename: / { print $2 }' Packages.derivative)" - fi - - UDEBS="${UDEBS} $(awk '/Filename: / { print $2 }' Packages)" - - # Downloading udebs packages - Echo_message "Downloading udebs..." - - if [ "${LB_DERIVATIVE}" = "true" ] - then - Echo_message "Building in derivative mode in debian+ layout.. a lot of 404 errors are ok here." - fi - - for UDEB in ${UDEBS} - do - if [ -f ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ] - then - # Copying cached udebs - cp ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ./ - else - # Downloading udebs - if ! ls "$(basename ${UDEB} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1 - then - wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB} || wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB} - fi - fi - done - - # Caching udebs - rm -rf ../cache/packages.installer_debian-installer.udeb - mkdir -p ../cache/packages.installer_debian-installer.udeb - cp *.udeb ../cache/packages.installer_debian-installer.udeb - - # Including local udebs - if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb - then - for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb - do - if [ -e "${FILE}" ] - then - Install_file "${FILE}" "pool" - - # Prefer local udebs over downloaded udebs - rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb - fi - done - fi - - if Find_files ../config/packages.binary/*_all.udeb || Find_files ../config/packages/*_all.udeb - then - for FILE in ../config/packages.binary/*_all.udeb ../config/packages/*_all.udeb - do - if [ -e "${FILE}" ] - then - Install_file "${FILE}" "pool" - - # Prefer local udebs over downloaded udebs - rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb - fi - done - fi - - # Excluding udebs - for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd - do - if [ -e "${LOCATION}" ] - then - grep -v "^#" "${LOCATION}/namaste/udeb_exclude" > exclude || true - grep -v "^#" "${LOCATION}/namaste/exclude-udebs" >> exclude || true - grep -v "^#" "${LOCATION}/namaste/exclude-udebs-${LB_ARCHITECTURES}" >> exclude || true - - continue - fi - done - - # Local exclude file - if [ -e ../config/debian-installer/udeb_exclude ] - then - cat ../config/debian-installer/udeb_exclude >> exclude - fi - - # Excluding udebs from excludes because we want them to be in the image on purpose - sed -i -e 's|di-utils-exit-installer||' exclude # used for live-installer-launcher - - while read EXCLUDE - do - if [ "${LB_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ] - then - continue - fi - - rm -f ${EXCLUDE}_*.udeb - done < exclude - - # Moving udebs - for UDEB in ${UDEBS} - do - if [ -f "$(basename ${UDEB})" ] - then - mkdir -p $(dirname ${UDEB}) - mv "$(basename ${UDEB})" "$(dirname ${UDEB})" - fi - done - - # Creating udeb indices - mkdir -p dists/${LB_DISTRIBUTION}/main/debian-installer/binary-"${LB_ARCHITECTURES}" - cd "${OLDPWD}" - - mv binary.udeb chroot/root - echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh - Chroot chroot "sh binary.sh" - rm -f chroot/binary.sh - mv chroot/root/binary.udeb ./ - - cd binary.udeb - gzip -9 -c dists/${LB_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz - - rm -f Packages* exclude - find . | cpio -dmpu "${OLDPWD}"/binary - cd "${OLDPWD}" - - rm -rf binary.udeb - rm -rf binary.deb - - # Generating release file - mv binary chroot/root - - if [ -e chroot/etc/os-release ] - then - _VERSION="$(. chroot/etc/os-release && echo ${VERSION_ID})" - fi - - if [ -n "${_VERSION}" ]; then - _LB_APT_VERSION_OPT='-o APT::FTPArchive::Release::Version="'"${_VERSION}"'"' - fi - - case "${LB_PARENT_DISTRIBUTION}" in - sid) - _SUITE="unstable" - ;; - - *) - _SUITE="${LB_PARENT_DISTRIBUTION}" - ;; - esac - -cat > chroot/binary.sh << EOF -cd /root/binary && apt-ftparchive \ - -o APT::FTPArchive::Release::Origin="Hamara Svastik" \ - -o APT::FTPArchive::Release::Label="Hamara Svastik" \ - -o APT::FTPArchive::Release::Suite="${_SUITE}" \ - ${_LB_APT_VERSION_OPT} \ - -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \ - -o APT::FTPArchive::Release::Date="$(date -R)" \ - -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ - -o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \ - -o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \ - release dists/namaste > dists/${LB_DISTRIBUTION}/Release -EOF - - Chroot chroot "sh binary.sh" - rm -f chroot/binary.sh - mv chroot/root/binary ./ - - case "${LB_PARENT_DISTRIBUTION}" in - jessie) - DISTRIBUTIONS="stable" - ;; - - *) - DISTRIBUTIONS="namaste" - ;; - esac - - if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ] - then - DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}" - fi - - case "${LIVE_IMAGE_TYPE}" in - hdd) - case "${LB_BINARY_FILESYSTEM}" in - fat*|ntfs) - # Creating dist directories - for DISTRIBUTION in ${DISTRIBUTIONS} - do - cp -a binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} - done - ;; - esac - ;; - - *) - # Creating dist symlinks - for DISTRIBUTION in ${DISTRIBUTIONS} - do - ln -s ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} - done - - ln -s . binary/debian - ;; - esac -fi - -Repack_initrd() -{ - local TARGET_INITRD - local INCLUDE_PATH - TARGET_INITRD="${1}" - INCLUDE_PATH="${2}" - REPACK_TMPDIR="unpacked-initrd" - - if [ -d "${INCLUDE_PATH}" ] - then - INCLUDE_PATH=$(readlink -f ${INCLUDE_PATH}) - fi - - # cpio does not have a "extract to directory", so we must change directory - mkdir -p ${REPACK_TMPDIR} - cd ${REPACK_TMPDIR} - - gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames - if [ ! -d "${INCLUDE_PATH}" ] - then - # Invoked the old way, just copy the preseeds - for _FILE in ../config/preseed/*.cfg ../config/preseed/*.cfg.installer - do - if [ -e "${_FILE}" ] - then - cp "${_FILE}" . - fi - done - else - # New way, include target directory content in the initrd - REPACK_TMPDIR_ABS="${PWD}" - cd "${INCLUDE_PATH}" - find -print0 | cpio -pumd0 --no-preserve-owner "${REPACK_TMPDIR_ABS}/" - cd "${OLDPWD}" - fi - find -print0 | cpio -H newc -o0 | gzip -9 > ../${TARGET_INITRD} - - cd .. - rm -rf ${REPACK_TMPDIR} -} - -# Preseed d-i by repacking the initrd in certain situations -if [ "${DI_IMAGE_TYPE}" = "netboot" ] && ( ls config/preseed/*.cfg > /dev/null 2>&1 || ls config/preseed/*.cfg.installer > /dev/null 2>&1 ) -then - Repack_initrd "${DESTDIR}"/"${INITRD_DI}" - - if [ -e "${DESTDIR}"/"${INITRD_GI}" ] - then - Repack_initrd "${DESTDIR}"/"${INITRD_GI}" - fi -fi - -# Include content of config/includes.installer if exists and not empty -if [ -d config/includes.installer ] && [ -n "$(ls -A config/includes.installer)" ] -then - Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.installer - - if [ -e "${DESTDIR}"/"${INITRD_GI}" ] - then - Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.installer - fi -fi - -case "${LB_MODE}" in - progress-linux) - mv binary/install binary/installer - - rm -f binary/debian - - for _DIRECTORY in dists pool project firmware - do - if [ -e "binary/${_DIRECTORY}" ] - then - mv binary/"${_DIRECTORY}" binary/installer - fi - done - ;; -esac - -# Saving cache -Save_cache cache/packages.binary - -# Removing depends -Remove_package - -# Creating stage file -Create_stagefile .build/installer_debian-installer -- 2.17.1 From 45f31cbd2e3bb1a62755fa0e614f9a88b8056d1a Mon Sep 17 00:00:00 2001 From: isaagar Date: Thu, 1 Feb 2018 19:05:08 +0530 Subject: [PATCH 4/4] udpate confs and mkbuild --- hamara-sugam.conf | 2 -- hamara-svastik.conf | 52 --------------------------------------------- mkbuild | 4 ++-- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100755 hamara-svastik.conf diff --git a/hamara-sugam.conf b/hamara-sugam.conf index eea09e4..25dba62 100755 --- a/hamara-sugam.conf +++ b/hamara-sugam.conf @@ -1,5 +1,3 @@ -MIRROR=in.devel.hamaralinux.org - lb config --apt apt \ --apt-indices true \ --apt-recommends true \ diff --git a/hamara-svastik.conf b/hamara-svastik.conf deleted file mode 100755 index 31d3687..0000000 --- a/hamara-svastik.conf +++ /dev/null @@ -1,52 +0,0 @@ -lb config --apt apt \ - --apt-indices true \ - --apt-recommends true \ - --apt-secure true \ - --archive-areas "main contrib non-free" \ - --binary-images iso-hybrid \ - --bootloaders syslinux,grub-efi \ - --compression gzip \ - --debian-installer live \ - --debian-installer-distribution svastik \ - --debian-installer-gui true \ - --debootstrap-options "--keyring=/usr/share/keyrings/hamara-archive-keyring.gpg" \ - --distribution svastik \ - --parent-distribution svastik \ - --parent-debian-installer-distribution svastik \ - --firmware-binary true \ - --firmware-chroot true \ - --initramfs live-boot \ - --initsystem systemd \ - --iso-application Hamara Svastik \ - --iso-preparer live-build 1:20171013 \ - --iso-volume Hamara Svastik Live \ - --keyring-packages hamara-keyring \ - --linux-packages linux-image \ - --memtest memtest86 \ - --parent-mirror-bootstrap http://ftp.us.debian.org/debian \ - --parent-mirror-chroot http://ftp.us.debian.org/debian \ - --parent-mirror-chroot-security http://security.debian.org \ - --parent-mirror-chroot-updates http://ftp.us.debian.org/debian \ - --parent-mirror-chroot-backports http://ftp.us.debian.org/debian \ - --parent-mirror-binary http://ftp.us.debian.org/debian \ - --parent-mirror-binary-security http://security.debian.org \ - --parent-mirror-binary-updates http://ftp.us.debian.org/debian \ - --parent-mirror-binary-backports http://ftp.us.debian.org/debian \ - --parent-mirror-debian-installer http://ftp.us.debian.org/debian \ - --mirror-bootstrap http://devel.hamaralinux.org/hamara \ - --mirror-chroot http://devel.hamaralinux.org/hamara \ - --mirror-chroot-security http://security.debian.org \ - --mirror-chroot-updates http://devel.hamaralinux.org/hamara \ - --mirror-chroot-backports http://devel.hamaralinux.org/hamara \ - --mirror-binary http://devel.hamaralinux.org/hamara \ - --mirror-binary-security http://security.debian.org \ - --mirror-binary-updates http://devel.hamaralinux.org/hamara \ - --mirror-binary-backports http://devel.hamaralinux.org/hamara \ - --mirror-debian-installer http://ftp.us.debian.org/debian \ - --mode debian \ - --system live \ - --source-images iso \ - --hdd-label Hamara_Svastik_2_Live \ - --security false \ - --updates false \ - --backports false diff --git a/mkbuild b/mkbuild index 6bd4de2..1290721 100755 --- a/mkbuild +++ b/mkbuild @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2017 I Sagar +# Copyright (C) 2018 I Sagar # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -140,7 +140,7 @@ HELP(){ echo "* Parameters :" echo " ARCH -- amd64 | i386 | all" echo " MIRROR -- devel.hamaralinux.org | in.devel.hamaralinux.org " - echo " RELEASE -- minimal | hamara | hamara-sugam " + echo " RELEASE -- hamara | hamara-sugam " echo " " echo "* For more info. " echo " man ./HELP " -- 2.17.1