diff --git a/configuration.sh b/configuration.sh index 269108be777a..ef1754a31ea8 100644 --- a/configuration.sh +++ b/configuration.sh @@ -27,7 +27,7 @@ # common options -REVISION="5.06" # all boards have same revision +REVISION="5.07" # all boards have same revision ARCH="armhf" CROSS_COMPILE="arm-linux-gnueabihf-" TARGETS="zImage" @@ -626,7 +626,7 @@ PACKAGE_LIST="automake bash-completion bc bridge-utils build-essential cmake cpu iw libtool libwrap0-dev libssl-dev lirc lsof fake-hwclock wpasupplicant libusb-dev psmisc \ ntp parted pkg-config pv rfkill rsync sudo curl dialog crda wireless-regdb ncurses-term \ sysfsutils toilet u-boot-tools unattended-upgrades unzip usbutils vlan wireless-tools \ - console-setup console-data console-common unicode-data openssh-server libmtp-runtime initramfs-tools" + console-setup console-data console-common unicode-data openssh-server libmtp-runtime initramfs-tools ca-certificates" # Non-essential packages PACKAGE_LIST_ADDITIONAL="alsa-utils btrfs-tools bluez hddtemp i2c-tools iperf ir-keytable iotop iozone3 weather-util weather-util-data stress \ @@ -637,18 +637,22 @@ PACKAGE_LIST_ADDITIONAL="alsa-utils btrfs-tools bluez hddtemp i2c-tools iperf ir case $RELEASE in wheezy) PACKAGE_LIST_RELEASE="less makedev kbd libnl-dev acpid acpi-support-base" + PACKAGE_LIST_EXCLUDE="" ;; jessie) PACKAGE_LIST_RELEASE="less makedev kbd thin-provisioning-tools libnl-3-dev libnl-genl-3-dev libpam-systemd \ software-properties-common python-software-properties libnss-myhostname f2fs-tools" + PACKAGE_LIST_EXCLUDE="" ;; - trusty) + trusty) PACKAGE_LIST_RELEASE="man-db wget iptables nano libnl-3-dev libnl-genl-3-dev software-properties-common \ python-software-properties f2fs-tools acpid" + PACKAGE_LIST_EXCLUDE="ureadahead plymouth" ;; xenial) PACKAGE_LIST_RELEASE="man-db wget iptables nano thin-provisioning-tools libnl-3-dev libnl-genl-3-dev libpam-systemd \ software-properties-common python-software-properties libnss-myhostname f2fs-tools" + PACKAGE_LIST_EXCLUDE="" ;; esac diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index b3b93f3fd66d..09de50325f38 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -140,6 +140,7 @@ debootstrap_ng() create_rootfs_cache() { [[ $BUILD_DESKTOP == yes ]] && local variant_desktop=yes + [[ -n $PACKAGE_LIST_EXCLUDE ]] && local package_exclude="--exclude="${PACKAGE_LIST_EXCLUDE// /,} local packages_hash=$(get_package_list_hash $PACKAGE_LIST) local cache_fname="$CACHEDIR/rootfs/$RELEASE${variant_desktop:+_desktop}-ng-$ARCH.$packages_hash.tgz" local display_name=$RELEASE${variant_desktop:+_desktop}-ng-$ARCH.${packages_hash:0:3}...${packages_hash:29}.tgz @@ -166,7 +167,7 @@ create_rootfs_cache() [[ -z $OUTPUT_DIALOG && $RELEASE != wheezy ]] && local apt_extra_progress="--show-progress -o DPKG::Progress-Fancy=1" display_alert "Installing base system" "Stage 1/2" "info" - eval 'debootstrap --include=debconf-utils,locales --arch=$ARCH --foreign $RELEASE $CACHEDIR/sdcard/ $apt_mirror' \ + eval 'debootstrap --include=debconf-utils,locales $package_exclude --arch=$ARCH --foreign $RELEASE $CACHEDIR/sdcard/ $apt_mirror' \ ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \ ${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Debootstrap (stage 1/2)..." $TTY_Y $TTY_X'} \ ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} diff --git a/debootstrap.sh b/debootstrap.sh index f477bf42ce0f..5775ca1afe19 100644 --- a/debootstrap.sh +++ b/debootstrap.sh @@ -99,8 +99,9 @@ fi if [ ! -f "$cache_fname" ]; then # debootstrap base system +[[ -n $PACKAGE_LIST_EXCLUDE ]] && local package_exclude="--exclude="${PACKAGE_LIST_EXCLUDE// /,} [[ $DISTRIBUTION == "Debian" ]] && local redir="http://httpredir.debian.org/debian/" -debootstrap --include=openssh-server,debconf-utils --arch=$ARCH --foreign $RELEASE $CACHEDIR/sdcard/ $redir | dialog --backtitle "$backtitle" --title "Debootstrap $DISTRIBUTION $RELEASE base system to image template ..." --progressbox $TTY_Y $TTY_X +debootstrap --include=openssh-server,debconf-utils $package_exclude --arch=$ARCH --foreign $RELEASE $CACHEDIR/sdcard/ $redir | dialog --backtitle "$backtitle" --title "Debootstrap $DISTRIBUTION $RELEASE base system to image template ..." --progressbox $TTY_Y $TTY_X # we need emulator for second stage if [[ $ARCH == *64* ]]; then