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

Bring in firefox from buster

Browse Source
This commit is contained in:
Hal Emmerich 2019-01-09 14:44:24 -06:00
parent 87d3219b0a
commit c6adc16285
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/BuildResources/apt-preferences Normal file
View File

@ -0,0 +1,7 @@
Package: *
Pin: release a=stable
Pin-Priority: 700
Package: *
Pin: release a=testing
Pin-Priority: 650

9
resources/BuildResources/sources.list
View File

@ -4,6 +4,9 @@ deb-src http://ftp.us.debian.org/debian stretch main
deb http://ftp.us.debian.org/debian stretch-updates main
deb-src http://ftp.us.debian.org/debian stretch-updates main
#Disable these, as the new versions of firefox or chromium installed crash immediately see issue #29
#deb http://security.debian.org/debian-security/ stretch/updates main
#deb-src http://security.debian.org/debian-security/ stretch/updates main
deb http://security.debian.org/debian-security/ stretch/updates main
deb-src http://security.debian.org/debian-security/ stretch/updates main
#Add buster to grab a functional firefox release
# /etc/apt/preferences prevents this from updating the whole system
deb http://deb.debian.org/debian/ testing main

3
scripts/InstallScripts/InstallPackages.sh
View File

@ -32,6 +32,9 @@ locale-gen
apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-cli dconf-editor sudo dtrx emacs25
apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome
#install firefox from buster
apt -t testing install -y firefox-esr
[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice firefox-esr
[ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt

5
scripts/buildDebianFs.sh
View File

@ -95,6 +95,8 @@ chmod +x $outmnt/*.sh
#This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests
cp /etc/hosts $outmnt/etc/
cp $build_resources/sources.list $outmnt/etc/apt/sources.list
#setup apt pinning
cp $build_resources/apt-preferences $outmnt/etc/apt/preferences
#Setup the locale
chroot $outmnt echo en_US.UTF-8 UTF-8 > /etc/locale.gen
@ -111,6 +113,9 @@ chroot $outmnt apt-get clean
#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 firefox-esr sudo pavucontrol-qt
#Grab firefox from buster, since stretch is broken
chroot $outmnt apt -t testing install -y -d firefox-esr
#Download support for libinput-gestures
chroot $outmnt apt install -y libinput-tools xdotool build-essential
#Package is copied into /InstallResources/packages