JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Workaround for Snap-less Chromium on Focal by downloading it from Debian (#1982)"

Browse Source 
This reverts commit faac552921.
This commit is contained in:
Igor Pecovnik
2020-08-04 15:16:09 +02:00
parent c3c52bd9de
commit 7cb7de30be
2 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/configuration.sh
View File

@@ -240,10 +240,10 @@ case $RELEASE in
focal)
DEBOOTSTRAP_COMPONENTS="main,universe"
DEBOOTSTRAP_LIST+=" rng-tools debian-archive-keyring fdisk"
DEBOOTSTRAP_LIST+=" rng-tools fdisk"
[[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE="man-db kbd net-tools gnupg2 dirmngr networkd-dispatcher selinux-policy-default"
PACKAGE_LIST_DESKTOP+=" xserver-xorg-input-all paprefs dbus-x11 pulseaudio-module-gsettings onboard"
PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium system-config-printer-common system-config-printer \
PACKAGE_LIST_DESKTOP_RECOMMENDS+=" firefox system-config-printer-common system-config-printer \
language-selector-gnome viewnior"
PACKAGE_LIST_DESKTOP_FULL+=" thunderbird"
PACKAGE_LIST_PREDEPENDS="policykit-1-gnome notification-daemon"
@@ -254,7 +254,7 @@ case $RELEASE in
DEBOOTSTRAP_LIST+=" rng-tools fdisk"
[[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE="man-db kbd net-tools gnupg2 dirmngr networkd-dispatcher selinux-policy-default"
PACKAGE_LIST_DESKTOP+=" xserver-xorg-input-all paprefs dbus-x11 pulseaudio-module-gsettings onboard"
PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium system-config-printer-common system-config-printer \
PACKAGE_LIST_DESKTOP_RECOMMENDS+=" firefox system-config-printer-common system-config-printer \
language-selector-gnome mirage"
PACKAGE_LIST_DESKTOP_FULL+=" thunderbird"
PACKAGE_LIST_PREDEPENDS="policykit-1-gnome notification-daemon"

30
lib/general.sh
View File

@@ -171,36 +171,6 @@ create_sources_list()
;;
esac
# workaround for Chromium by downloading it from Debian
if [[ $release == focal || $release == eoan ]]; then
cat <<-EOF > "${basedir}"/etc/apt/preferences.d/chromium.pref
# Note: 2 blank lines are required between entries
Package: *
Pin: release a=${release}
Pin-Priority: 500
Package: *
Pin: origin "${DEBIAN_MIRROR//\/debian}"
Pin-Priority: 300
# Pattern includes 'chromium', 'chromium-browser' and similarly
# named dependencies:
Package: chromium*
Pin: origin "${DEBIAN_MIRROR//\/debian}"
Pin-Priority: 700
EOF
cat <<-EOF > "${basedir}"/etc/apt/sources.list.d/debian.list
deb http://${DEBIAN_MIRROR} stable main
deb http://${DEBIAN_MIRROR} stable-updates main
deb http://${DEBIAN_MIRROR}-security stable/updates main
EOF
chroot "${SDCARD}" /bin/bash -c "apt-key add /usr/share/keyrings/debian-archive-keyring.gpg >/dev/null 2>&1"
fi
# stage: add armbian repository and install key
if [[ $DOWNLOAD_MIRROR == "china" ]]; then
echo "deb http://mirrors.tuna.tsinghua.edu.cn/armbian $RELEASE main ${RELEASE}-utils ${RELEASE}-desktop" > "${SDCARD}"/etc/apt/sources.list.d/armbian.list