From 7094273ca8c3c323ed8f4c0cd56edbae5cdfb0ea Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 15 Dec 2017 19:18:51 +0100 Subject: [PATCH] Chromium for Stretch has different location and name for default settings. Fixing and fixing bug in BSP when overwriting default Chromim packages --- lib/desktop.sh | 5 ++--- lib/makeboarddeb.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/desktop.sh b/lib/desktop.sh index b1c4d29121..e23c597779 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -22,9 +22,8 @@ install_desktop () fi # install optimized chromium configuration - if [[ -d $SDCARD/usr/lib/chromium-browser/ ]]; then - cp $SRC/packages/blobs/desktop/chromium.conf $SDCARD/etc/chromium-browser/default - fi + [[ -d $SDCARD/etc/chromium-browser ]] && cp $SRC/packages/blobs/desktop/chromium.conf $SDCARD/etc/chromium-browser/default + [[ -d $SDCARD/etc/chromium.d ]] && cp $SRC/packages/blobs/desktop/chromium.conf $SDCARD/etc/chromium.d/chromium.conf # install default desktop settings cp -R $SRC/packages/blobs/desktop/skel/. $SDCARD/etc/skel diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh index ebb315c1e5..9c546290eb 100644 --- a/lib/makeboarddeb.sh +++ b/lib/makeboarddeb.sh @@ -36,7 +36,7 @@ create_board_package() Provides: armbian-bsp Conflicts: armbian-bsp Suggests: armbian-config - Replaces: base-files, mpv, lightdm-gtk-greeter, armbian-tools-$RELEASE + Replaces: base-files, mpv, lightdm-gtk-greeter, chromium-browser, chromium, armbian-tools-$RELEASE Recommends: bsdutils, parted, python3-apt, util-linux, toilet Description: Armbian tweaks for $RELEASE on $BOARD ($BRANCH branch) EOF