From 1f13dc0d0a5e5f58b4dd4c091f22cbcf0053569d Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Fri, 26 Feb 2016 19:25:49 +0300 Subject: [PATCH] Moved debootstrap packages list to configuration.sh --- configuration.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++ debootstrap-ng.sh | 56 +++++------------------------------------------ debootstrap.sh | 56 +++++------------------------------------------ 3 files changed, 65 insertions(+), 102 deletions(-) diff --git a/configuration.sh b/configuration.sh index 030fe98908..2cd9f7fa1b 100644 --- a/configuration.sh +++ b/configuration.sh @@ -512,11 +512,66 @@ esac [[ -z $CPUMIN && ($LINUXFAMILY == udoo || $LINUXFAMILY == neo ) ]] && CPUMIN="392000" && CPUMAX="996000" && GOVERNOR="interactive" [[ -z $GOVERNOR ]] && GOVERNOR="ondemand" + +# Essential packages +PACKAGE_LIST="alsa-utils automake btrfs-tools bash-completion bc bridge-utils bluez build-essential cmake cpufrequtils curl psmisc \ + device-tree-compiler dosfstools evtest figlet fbset fping git haveged hddtemp hdparm hostapd htop i2c-tools ifenslave-2.6 \ + iperf ir-keytable iotop iozone3 iw less libbluetooth-dev libbluetooth3 libtool libwrap0-dev libfuse2 libssl-dev lirc lsof makedev \ + module-init-tools mtp-tools nano ntfs-3g ntp parted pkg-config pciutils pv python-smbus rfkill rsync screen stress sudo subversion \ + sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools weather-util weather-util-data wget wpasupplicant \ + iptables dvb-apps libdigest-sha-perl libproc-processtable-perl w-scan apt-transport-https sysbench libusb-dev dialog fake-hwclock \ + console-setup console-data kbd console-common unicode-data openssh-server man-db" + +# Non-essential packages +PACKAGE_LIST_ADDITIONAL="" + +# Release specific packages +case $RELEASE in + wheezy) + PACKAGE_LIST_RELEASE="libnl-dev acpid acpi-support-base" + ;; + jessie) + PACKAGE_LIST_RELEASE="thin-provisioning-tools libnl-3-dev libnl-genl-3-dev libpam-systemd \ + software-properties-common python-software-properties libnss-myhostname f2fs-tools" + ;; + trusty) + PACKAGE_LIST_RELEASE="libnl-3-dev libnl-genl-3-dev software-properties-common python-software-properties f2fs-tools acpid" + ;; +esac + +# additional desktop packages +if [[ $BUILD_DESKTOP == yes ]]; then + # common packages + PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-core xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage radiotray wicd thunar-volman galculator \ + gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl" + # release specific desktop packages + case $RELEASE in + wheezy) + PACKAGE_LIST_DESKTOP="mozo pluma iceweasel icedove" + ;; + jessie) + PACKAGE_LIST_DESKTOP="mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove" + ;; + trusty) + PACKAGE_LIST_DESKTOP="libreoffice-writer libreoffice-java-common thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends" + ;; + esac + # hardware acceleration support packages + # cache is not LINUXCONFIG and BRANCH specific, so installing anyway + #if [[ $LINUXCONFIG == *sun* && $BRANCH != "next" ]] && + PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP xorg-dev xutils-dev x11proto-dri2-dev xutils-dev libdrm-dev libvdpau-dev" +else + PACKAGE_LIST_DESKTOP="" +fi + # For user override if [[ -f "$SRC/userpatches/lib.config" ]]; then display_alert "Using user configuration override" "userpatches/lib.config" "info" source $SRC/userpatches/lib.config fi + +# Build final package list after possible override +PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_RELEASE $PACKAGE_LIST_ADDITIONAL $PACKAGE_LIST_DESKTOP" # debug echo -e "Config: $LINUXCONFIG\nKernel source: $LINUXKERNEL\nBranch: $KERNELBRANCH" >> $DEST/debug/install.log diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index 605da299dc..fc80ddc4f9 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -125,13 +125,14 @@ debootstrap_ng() create_rootfs_cache() { [[ $BUILD_DESKTOP == yes ]] && local variant_desktop=yes - local cache_fname="$DEST/cache/rootfs/$RELEASE${variant_desktop:+_desktop}-ng.tgz" + local packages_hash=$(md5sum <<< $PACKAGE_LIST | cut -d' ' -f 1) + local cache_fname="$DEST/cache/rootfs/$RELEASE${variant_desktop:+_desktop}-ng.$packages_hash.tgz" if [[ -f $cache_fname ]]; then local filemtime=$(stat -c %Y $cache_fname) local currtime=$(date +%s) local diff=$(( (currtime - filemtime) / 86400 )) display_alert "Extracting $(basename $cache_fname)" "$diff days old" "info" - pv -p -b -r -c -N "$(basename $cache_fname)" "$cache_fname" | pigz -dc | tar xp -C $DEST/cache/sdcard/ + pv -p -b -r -c -N "$RELEASE${variant_desktop:+_desktop}-ng.tgz" "$cache_fname" | pigz -dc | tar xp -C $DEST/cache/sdcard/ else display_alert "Creating new rootfs for" "$RELEASE" "info" @@ -222,56 +223,9 @@ EOF ${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Updating package lists..." 20 80'} \ ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} - # common packages - local package_list="alsa-utils automake btrfs-tools bash-completion bc bridge-utils bluez build-essential cmake cpufrequtils curl psmisc \ - device-tree-compiler dosfstools evtest figlet fbset fping git haveged hddtemp hdparm hostapd htop i2c-tools ifenslave-2.6 \ - iperf ir-keytable iotop iozone3 iw less libbluetooth-dev libbluetooth3 libtool libwrap0-dev libfuse2 libssl-dev lirc lsof makedev \ - module-init-tools mtp-tools nano ntfs-3g ntp parted pkg-config pciutils pv python-smbus rfkill rsync screen stress sudo subversion \ - sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools weather-util weather-util-data wget wpasupplicant \ - iptables dvb-apps libdigest-sha-perl libproc-processtable-perl w-scan apt-transport-https sysbench libusb-dev dialog fake-hwclock \ - console-setup console-data kbd console-common unicode-data openssh-server man-db" - - # release specific packages - # NOTE: wheezy doen't have f2fs-tools package available - case $RELEASE in - wheezy) - package_list="$package_list libnl-dev acpid acpi-support-base" - ;; - jessie) - package_list="$package_list thin-provisioning-tools libnl-3-dev libnl-genl-3-dev libpam-systemd \ - software-properties-common python-software-properties libnss-myhostname f2fs-tools" - ;; - trusty) - package_list="$package_list libnl-3-dev libnl-genl-3-dev software-properties-common python-software-properties f2fs-tools acpid" - ;; - esac - - # additional desktop packages - if [[ $BUILD_DESKTOP == yes ]]; then - # common packages - package_list="$package_list xserver-xorg xserver-xorg-core xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage radiotray wicd thunar-volman galculator \ - gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl" - # release specific desktop packages - case $RELEASE in - wheezy) - package_list="$package_list mozo pluma iceweasel icedove" - ;; - jessie) - package_list="$package_list mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove" - ;; - trusty) - package_list="$package_list libreoffice-writer libreoffice-java-common thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends" - ;; - esac - # hardware acceleration support packages - # cache is not LINUXCONFIG and BRANCH specific, so installing anyway - #if [[ $LINUXCONFIG == *sun* && $BRANCH != "next" ]] && - package_list="$package_list xorg-dev xutils-dev x11proto-dri2-dev xutils-dev libdrm-dev libvdpau-dev" - fi - # stage: install additional packages display_alert "Installing packages for" "Armbian" "info" - eval 'LC_ALL=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y $apt_extra --no-install-recommends install $package_list"' \ + eval 'LC_ALL=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y $apt_extra --no-install-recommends install $PACKAGE_LIST"' \ ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \ ${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Installing Armbian system..." 20 80'} \ ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} @@ -294,7 +248,7 @@ EOF tar cp --directory=$DEST/cache/sdcard/ --exclude='./dev/*' --exclude='./proc/*' --exclude='./run/*' --exclude='./tmp/*' \ --exclude='./sys/*' . | \ - pv -p -b -r -s $(du -sb $DEST/cache/sdcard/ | cut -f1) -N "$(basename $cache_fname)" | pigz > $cache_fname + pv -p -b -r -s $(du -sb $DEST/cache/sdcard/ | cut -f1) -N "$RELEASE${variant_desktop:+_desktop}-ng.tgz" | pigz > $cache_fname fi } ############################################################################# diff --git a/debootstrap.sh b/debootstrap.sh index 7057129a85..3c55a83125 100644 --- a/debootstrap.sh +++ b/debootstrap.sh @@ -78,7 +78,8 @@ fi # rootfs cache file name [[ $BUILD_DESKTOP == yes ]] && local variant_desktop=yes -local cache_fname="$DEST/cache/rootfs/$RELEASE${variant_desktop:+_desktop}.tgz" +local packages_hash=$(md5sum <<< $PACKAGE_LIST | cut -d' ' -f 1) +local cache_fname="$DEST/cache/rootfs/$RELEASE${variant_desktop:+_desktop}.$packages_hash.tgz" # Uncompress from cache if [ -f "$cache_fname" ]; then @@ -86,7 +87,7 @@ if [ -f "$cache_fname" ]; then currtime=`date +%s` diff=$(( (currtime - filemtime) / 86400 )) display_alert "Extracting $RELEASE from cache" "$diff days old" "info" - pv -p -b -r -c -N "$cache_fname" "$cache_fname" | pigz -dc | tar xp -C $DEST/cache/sdcard/ + pv -p -b -r -c -N "$(basename $cache_fname)" "$cache_fname" | pigz -dc | tar xp -C $DEST/cache/sdcard/ rm $DEST/cache/sdcard/etc/resolv.conf echo "nameserver 8.8.8.8" > $DEST/cache/sdcard/etc/resolv.conf if [ "$diff" -gt "3" ]; then @@ -131,50 +132,6 @@ rm $DEST/cache/sdcard/armbian.key # update and upgrade LC_ALL=C LANGUAGE=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y update" | dialog --progressbox "Updating package databases ..." 20 70 -# install aditional packages -PAKETKI="alsa-utils automake btrfs-tools bash-completion bc bridge-utils bluez build-essential cmake cpufrequtils curl psmisc \ -device-tree-compiler dosfstools evtest figlet fbset fping git haveged hddtemp hdparm hostapd htop i2c-tools ifenslave-2.6 \ -iperf ir-keytable iotop iozone3 iw less libbluetooth-dev libbluetooth3 libtool libwrap0-dev libfuse2 libssl-dev lirc lsof makedev \ -module-init-tools mtp-tools nano ntfs-3g ntp parted pkg-config pciutils pv python-smbus rfkill rsync screen stress sudo subversion \ -sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools weather-util weather-util-data wget \ -wpasupplicant iptables dvb-apps libdigest-sha-perl libproc-processtable-perl w-scan apt-transport-https sysbench libusb-dev dialog fake-hwclock man-db" - -# additional distributios-specific packages -case $RELEASE in - wheezy) - PAKETKI="$PAKETKI libnl-dev acpid acpi-support-base" - ;; - jessie) - PAKETKI="$PAKETKI thin-provisioning-tools libnl-3-dev libnl-genl-3-dev libpam-systemd software-properties-common python-software-properties libnss-myhostname" - ;; - trusty) - PAKETKI="$PAKETKI libnl-3-dev libnl-genl-3-dev software-properties-common python-software-properties acpid" - ;; -esac - -# additional desktop packages -if [[ $BUILD_DESKTOP == yes ]]; then - # common packages - PAKETKI="$PAKETKI xserver-xorg xserver-xorg-core xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage radiotray wicd thunar-volman galculator \ - gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl" - # release specific desktop packages - case $RELEASE in - wheezy) - PAKETKI="$PAKETKI mozo pluma iceweasel icedove" - ;; - jessie) - PAKETKI="$PAKETKI mozo pluma iceweasel libreoffice-writer libreoffice-java-common icedove mpv" - ;; - trusty) - PAKETKI="$PAKETKI libreoffice-writer libreoffice-java-common thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends" - ;; - esac - # hardware acceleration support packages - # cache is not LINUXCONFIG and BRANCH specific, so installing anyway - #if [[ $LINUXCONFIG == *sun* && $BRANCH != "next" ]] && - PAKETKI="$PAKETKI xorg-dev xutils-dev x11proto-dri2-dev xutils-dev libdrm-dev libvdpau-dev" -fi - # generate locales and install packets display_alert "Install locales" "$DEST_LANG" "info" LC_ALL=C LANGUAGE=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y -qq install locales" @@ -183,10 +140,7 @@ LC_ALL=C LANGUAGE=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "locale-gen $D LC_ALL=C LANGUAGE=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "export CHARMAP=$CONSOLE_CHAR FONTFACE=8x16 LANG=$DEST_LANG LANGUAGE=$DEST_LANG DEBIAN_FRONTEND=noninteractive" LC_ALL=C LANGUAGE=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "update-locale LANG=$DEST_LANG LANGUAGE=$DEST_LANG LC_MESSAGES=POSIX" - -install_packet "$PAKETKI" "Installing Armbian on the top of $DISTRIBUTION $RELEASE base system ..." - -install_packet "console-setup console-data kbd console-common unicode-data" "Installing console packages" +install_packet "$PACKAGE_LIST" "Installing Armbian on the top of $DISTRIBUTION $RELEASE base system ..." chroot $DEST/cache/sdcard /bin/bash -c "apt-get clean" chroot $DEST/cache/sdcard /bin/bash -c "sync" @@ -205,7 +159,7 @@ KILLPROC=$(ps -uax | pgrep dbus-daemon | tail -1); if [ -n "$KILLPROC" ]; then k display_alert "Closing debootstrap process and preparing cache." "" "info" tar cp --directory=$DEST/cache/sdcard/ --exclude='./dev/*' --exclude='./proc/*' --exclude='./run/*' --exclude='./tmp/*' \ ---exclude='./mnt/*' --exclude='./sys/*' . | pv -p -b -r -s $(du -sb $DEST/cache/sdcard/ | cut -f1) -N "$cache_fname" | pigz > $cache_fname +--exclude='./mnt/*' --exclude='./sys/*' . | pv -p -b -r -s $(du -sb $DEST/cache/sdcard/ | cut -f1) -N "$(basename $cache_fname)" | pigz > $cache_fname fi # # mount proc, sys and dev