From 47bdb6504eb4743fa4b88328c73bb3dfd4fd4426 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sun, 5 Feb 2017 19:05:18 +0300 Subject: [PATCH] initial Debian Stretch target support --- configuration.sh | 9 +++++---- distributions.sh | 3 +++ general.sh | 4 ++-- scripts/customize-image.sh.template | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configuration.sh b/configuration.sh index 0edb325900..8cd00d26b0 100644 --- a/configuration.sh +++ b/configuration.sh @@ -134,7 +134,7 @@ PACKAGE_LIST="$PACKAGE_LIST automake libwrap0-dev libssl-dev libusb-dev libusb-1 # Non-essential packages PACKAGE_LIST_ADDITIONAL="alsa-utils btrfs-tools dosfstools hddtemp iotop iozone3 stress sysbench screen ntfs-3g vim pciutils \ evtest htop pv lsof apt-transport-https libfuse2 libdigest-sha-perl libproc-processtable-perl aptitude dnsutils f3 haveged \ - hdparm rfkill vlan sysstat bluez bluez-tools bash-completion hostapd git ethtool network-manager unzip ifenslave-2.6 lirc \ + hdparm rfkill vlan sysstat bluez bluez-tools bash-completion hostapd git ethtool network-manager unzip ifenslave lirc \ libpam-systemd iperf3 software-properties-common libnss-myhostname f2fs-tools" PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage thunar-volman galculator \ @@ -143,12 +143,10 @@ PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-f paman pavumeter pulseaudio-module-gconf pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri mpv \ libreoffice-writer libreoffice-style-tango libreoffice-gtk policykit-1" -PACKAGE_LIST_EXCLUDE="xfce4-mixer" - # Release specific packages case $RELEASE in jessie) - PACKAGE_LIST_RELEASE="less makedev kbd" + PACKAGE_LIST_RELEASE="less kbd" PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel policykit-1-gnome eject" ;; xenial) @@ -156,6 +154,9 @@ case $RELEASE in PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP thunderbird firefox gnome-icon-theme-full tango-icon-theme language-selector-gnome paprefs numix-gtk-theme" [[ $ARCH == armhf ]] && PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mate-utils ubuntu-mate-welcome mate-settings-daemon" ;; + stretch) + PACKAGE_LIST_RELEASE="man-db less kbd" + ;; esac DEBIAN_MIRROR='httpredir.debian.org/debian' diff --git a/distributions.sh b/distributions.sh index bbf8c0fdd6..0d52a5ea64 100644 --- a/distributions.sh +++ b/distributions.sh @@ -233,5 +233,8 @@ install_distribution_specific() wifi.powersave = 2 EOF ;; + + stretch) + ;; esac } diff --git a/general.sh b/general.sh index 4178e18f29..b540184e21 100644 --- a/general.sh +++ b/general.sh @@ -117,7 +117,7 @@ get_package_list_hash() # create_sources_list # -# : jessie|xenial +# : jessie|stretch|xenial # : path to root directory # create_sources_list() @@ -127,7 +127,7 @@ create_sources_list() [[ -z $basedir ]] && exit_with_error "No basedir passed to create_sources_list" case $release in - jessie) + jessie|stretch) cat <<-EOF > $basedir/etc/apt/sources.list deb http://${DEBIAN_MIRROR} $release main contrib non-free #deb-src http://${DEBIAN_MIRROR} $release main contrib non-free diff --git a/scripts/customize-image.sh.template b/scripts/customize-image.sh.template index 274835927b..8dcdfe11c7 100644 --- a/scripts/customize-image.sh.template +++ b/scripts/customize-image.sh.template @@ -20,4 +20,7 @@ case $RELEASE in xenial) # your code here ;; + stretch) + # your code here + ;; esac