From c63bbe7757e9a13b2e3e22850532d86198614f07 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 26 Sep 2018 11:35:33 -0500
Subject: [PATCH] lxqt: stretch: lock chromium to a [working] version
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
configs/bb.org-debian-stretch-lxqt-2gb-v4.14.conf | 8 ++++++++
configs/bb.org-debian-stretch-lxqt-v4.14.conf | 9 ++++++++-
configs/bb.org-debian-stretch-lxqt-v4.4.conf | 9 ++++++++-
configs/bb.org-debian-stretch-lxqt-xm.conf | 9 ++++++++-
scripts/chroot.sh | 7 +++++++
5 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/configs/bb.org-debian-stretch-lxqt-2gb-v4.14.conf b/configs/bb.org-debian-stretch-lxqt-2gb-v4.14.conf
index abd944c0c..ee8a315b8 100644
--- a/configs/bb.org-debian-stretch-lxqt-2gb-v4.14.conf
+++ b/configs/bb.org-debian-stretch-lxqt-2gb-v4.14.conf
@@ -107,6 +107,14 @@ repo_rcnee_pkg_list=" \
rcn-ee-archive-keyring \
"
+##
+#debian@BeagleBoard-X15:~$ sudo apt-cache madison chromium
+# chromium | 69.0.3497.92-1~deb9u1 | http://deb.debian.org/debian-security stretch/updates/main armhf Packages
+# chromium | 67.0.3396.87-1~deb9u1rcnee0~stretch+20180925 | http://repos.rcn-ee.com/debian stretch/main armhf Packages
+# chromium | 63.0.3239.84-1~deb9u1 | http://deb.debian.org/debian stretch/main armhf Packages
+# repo_rcnee_chromium_special="67.0.3396.87-1~deb9u1rcnee"
+##
+
##
chroot_manual_deborphan_list="xscreensaver"
diff --git a/configs/bb.org-debian-stretch-lxqt-v4.14.conf b/configs/bb.org-debian-stretch-lxqt-v4.14.conf
index 47d00ed37..f9852d653 100644
--- a/configs/bb.org-debian-stretch-lxqt-v4.14.conf
+++ b/configs/bb.org-debian-stretch-lxqt-v4.14.conf
@@ -112,7 +112,6 @@ deb_mirror=""
##
deb_additional_pkgs=" \
btrfs-progs \
- chromium \
libpam-systemd \
libopencv-dev \
lightdm \
@@ -180,6 +179,14 @@ repo_rcnee_pkg_list=" \
xserver-xorg-video-armada-etnaviv \
"
+##
+#debian@BeagleBoard-X15:~$ sudo apt-cache madison chromium
+# chromium | 69.0.3497.92-1~deb9u1 | http://deb.debian.org/debian-security stretch/updates/main armhf Packages
+# chromium | 67.0.3396.87-1~deb9u1rcnee0~stretch+20180925 | http://repos.rcn-ee.com/debian stretch/main armhf Packages
+# chromium | 63.0.3239.84-1~deb9u1 | http://deb.debian.org/debian stretch/main armhf Packages
+repo_rcnee_chromium_special="67.0.3396.87-1~deb9u1rcnee"
+##
+
##
chroot_manual_deborphan_list="xscreensaver"
diff --git a/configs/bb.org-debian-stretch-lxqt-v4.4.conf b/configs/bb.org-debian-stretch-lxqt-v4.4.conf
index 5c3423d90..180bdc994 100644
--- a/configs/bb.org-debian-stretch-lxqt-v4.4.conf
+++ b/configs/bb.org-debian-stretch-lxqt-v4.4.conf
@@ -112,7 +112,6 @@ deb_mirror=""
##
deb_additional_pkgs=" \
btrfs-progs \
- chromium \
libpam-systemd \
lightdm \
lxqt-about \
@@ -177,6 +176,14 @@ repo_rcnee_pkg_list=" \
xserver-xorg-video-armada-etnaviv \
"
+##
+#debian@BeagleBoard-X15:~$ sudo apt-cache madison chromium
+# chromium | 69.0.3497.92-1~deb9u1 | http://deb.debian.org/debian-security stretch/updates/main armhf Packages
+# chromium | 67.0.3396.87-1~deb9u1rcnee0~stretch+20180925 | http://repos.rcn-ee.com/debian stretch/main armhf Packages
+# chromium | 63.0.3239.84-1~deb9u1 | http://deb.debian.org/debian stretch/main armhf Packages
+repo_rcnee_chromium_special="67.0.3396.87-1~deb9u1rcnee"
+##
+
##
chroot_manual_deborphan_list="xscreensaver"
diff --git a/configs/bb.org-debian-stretch-lxqt-xm.conf b/configs/bb.org-debian-stretch-lxqt-xm.conf
index 390c8fa09..f989c3dea 100644
--- a/configs/bb.org-debian-stretch-lxqt-xm.conf
+++ b/configs/bb.org-debian-stretch-lxqt-xm.conf
@@ -112,7 +112,6 @@ deb_mirror=""
##
deb_additional_pkgs=" \
btrfs-progs \
- chromium \
libpam-systemd \
lightdm \
lxqt-about \
@@ -171,6 +170,14 @@ repo_rcnee_pkg_list=" \
wireguard-tools \
"
+##
+#debian@BeagleBoard-X15:~$ sudo apt-cache madison chromium
+# chromium | 69.0.3497.92-1~deb9u1 | http://deb.debian.org/debian-security stretch/updates/main armhf Packages
+# chromium | 67.0.3396.87-1~deb9u1rcnee0~stretch+20180925 | http://repos.rcn-ee.com/debian stretch/main armhf Packages
+# chromium | 63.0.3239.84-1~deb9u1 | http://deb.debian.org/debian stretch/main armhf Packages
+repo_rcnee_chromium_special="67.0.3396.87-1~deb9u1rcnee"
+##
+
##
chroot_manual_deborphan_list="xscreensaver"
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index d27845dd9..d1590c2f4 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -667,6 +667,13 @@ cat > "${DIR}/chroot_script.sh" <<-__EOF__
apt-get -y install ${repo_ros_pkg_list}
fi
+ if [ ! "x${repo_rcnee_chromium_special}" = "x" ] ; then
+ echo "Log: (chroot) Chromium Special:"
+ apt-cache madison chromium || true
+ apt -y --allow-downgrades install chromium=${repo_rcnee_chromium_special}* || true
+ apt-mark hold chromium || true
+ fi
+
##Install last...
if [ ! "x${repo_rcnee_pkg_version}" = "x" ] ; then
echo "Log: (chroot) Installing modules for: ${repo_rcnee_pkg_version}"
--
GitLab