g/PrawnOS-nonfree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove references to stretch in build system, make more generic to support future upgrades

Browse Source
This commit is contained in:
Hal Emmerich 2019-10-06 21:57:19 -05:00
parent 9df3a682e5
commit 40c258c49b
11 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/BuildResources/backports.list
View File

@ -1 +1 @@
deb http://ftp.debian.org/debian stretch-backports main deb http://ftp.debian.org/debian suite-backports main

4
resources/BuildResources/backports.pref
View File

@ -1,5 +1,5 @@
#Stable (stretch) defaults to 500, and higher priorities are used over lower #Stable defaults to 500, and higher priorities are used over lower
Package: * Package: *
Pin: release a=stretch-backports Pin: release a=suite-backports
Pin-Priority: 450 Pin-Priority: 450

3
resources/BuildResources/bullseye.list Normal file
View File

@ -0,0 +1,3 @@
#Add testing
# /etc/apt/preferences prevents this from updating the whole system
deb http://deb.debian.org/debian/ bullseye main

5
resources/BuildResources/bullseye.pref Normal file
View File

@ -0,0 +1,5 @@
#Stable defaults to 500, and higher priorities are used over lower
Package: *
Pin: release a=bullseye
Pin-Priority: 400

3
resources/BuildResources/buster.list
View File

@ -1,3 +0,0 @@
#Add buster to grab a functional firefox release
# /etc/apt/preferences prevents this from updating the whole system
deb http://deb.debian.org/debian/ buster main

5
resources/BuildResources/buster.pref
View File

@ -1,5 +0,0 @@
#Stable (stretch) defaults to 500, and higher priorities are used over lower
Package: *
Pin: release a=buster
Pin-Priority: 400

2
resources/BuildResources/sid.list
View File

@ -1,3 +1,3 @@
#Add sid to grab a functional chromium release #Add sid to grab bleeding edge software
# /etc/apt/preferences prevents this from updating the whole system # /etc/apt/preferences prevents this from updating the whole system
deb http://deb.debian.org/debian/ unstable main deb http://deb.debian.org/debian/ unstable main

2
resources/BuildResources/sid.pref
View File

@ -1,4 +1,4 @@
#Stable (stretch) defaults to 500, and higher priorities are used over lower #Stable defaults to 500, and higher priorities are used over lower
Package: * Package: *
Pin: release a=unstable Pin: release a=unstable

4
resources/BuildResources/sources.list
View File

@ -1,2 +1,2 @@
deb http://ftp.us.debian.org/debian stretch main deb http://ftp.us.debian.org/debian suite main
deb-src http://ftp.us.debian.org/debian stretch main deb-src http://ftp.us.debian.org/debian suite main

8
resources/BuildResources/updates.list
View File

@ -1,6 +1,6 @@
deb http://ftp.us.debian.org/debian stretch-updates main deb http://ftp.us.debian.org/debian suite-updates main
deb-src http://ftp.us.debian.org/debian stretch-updates main deb-src http://ftp.us.debian.org/debian suite-updates main
deb http://security.debian.org/debian-security/ stretch/updates main deb http://security.debian.org/debian-security/ suite/updates main
deb-src http://security.debian.org/debian-security/ stretch/updates main deb-src http://security.debian.org/debian-security/ suite/updates main

30
scripts/buildFilesystem.sh
View File

@ -126,34 +126,30 @@ chmod +x $outmnt/*.sh
#This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests
cp /etc/hosts $outmnt/etc/ cp /etc/hosts $outmnt/etc/
cp $build_resources/sources.list $outmnt/etc/apt/sources.list cp $build_resources/sources.list $outmnt/etc/apt/sources.list
sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list
if [ "$PRAWNOS_SUITE" != "sid" ] if [ "$PRAWNOS_SUITE" != "sid" ]
then then
# sid doesn't have updates or security; they're present for all other suites # sid doesn't have updates or security; they're present for all other suites
cat $build_resources/updates.list >> $outmnt/etc/apt/sources.list cat $build_resources/updates.list >> $outmnt/etc/apt/sources.list
sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list
# sid doesn't have backports; it's present for all other suites # sid doesn't have backports; it's present for all other suites
cp $build_resources/backports.list $outmnt/etc/apt/sources.list.d/ cp $build_resources/backports.list $outmnt/etc/apt/sources.list.d/
sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list.d/backports.list sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list.d/backports.list
#setup apt pinning #setup apt pinning
cp $build_resources/backports.pref $outmnt/etc/apt/preferences.d/ cp $build_resources/backports.pref $outmnt/etc/apt/preferences.d/
sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/preferences.d/backports.pref sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/preferences.d/backports.pref
fi # Install sid (unstable) as an additional source for bleeding edge packages.
if [ "$PRAWNOS_SUITE" = "stretch" ]
then
# Install buster as an additional source if the suite is less than buster
cp $build_resources/buster.list $outmnt/etc/apt/sources.list.d/
#setup apt pinning
cp $build_resources/buster.pref $outmnt/etc/apt/preferences.d/
fi
if [ "$PRAWNOS_SUITE" = "stretch" ] || [ "$PRAWNOS_SUITE" = "buster" ]
then
# Install sid as an additional source if the suite is less than bullseye.
# This should be replaced with bullseye after bullseye branches from sid.
cp $build_resources/sid.list $outmnt/etc/apt/sources.list.d/ cp $build_resources/sid.list $outmnt/etc/apt/sources.list.d/
#setup apt pinning #setup apt pinning
cp $build_resources/sid.pref $outmnt/etc/apt/preferences.d/ cp $build_resources/sid.pref $outmnt/etc/apt/preferences.d/
fi fi
if [ "$PRAWNOS_SUITE" = "buster" ]
then
# Install bullseye (testing) as an additional source
cp $build_resources/bullseye.list $outmnt/etc/apt/sources.list.d/
#setup apt pinning
cp $build_resources/bullseye.pref $outmnt/etc/apt/preferences.d/
fi
#Setup the locale #Setup the locale
cp $build_resources/locale.gen $outmnt/etc/locale.gen cp $build_resources/locale.gen $outmnt/etc/locale.gen
@ -178,7 +174,7 @@ chroot $outmnt apt install -y libinput-tools xdotool build-essential
chroot $outmnt apt-get install -y -t unstable -d xsecurelock chroot $outmnt apt-get install -y -t unstable -d xsecurelock
#Download the packages to be installed by Install.sh: #Download the packages to be installed by Install.sh:
chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice sudo pavucontrol-qt chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs accountsservice sudo pavucontrol-qt
if [ "$PRAWNOS_SUITE" = "stretch" ] if [ "$PRAWNOS_SUITE" = "stretch" ]
then then