From 8939d35f672e603011e7e09039f7d5ac29b6b4a4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 26 Aug 2021 21:14:07 +0200 Subject: [PATCH] Fix package_check --- conf/xorg.conf | 21 +++++++++++++++++++++ scripts/_common.sh | 2 ++ scripts/install | 8 ++++++++ scripts/restore | 8 ++++++++ scripts/upgrade | 8 ++++++++ 5 files changed, 47 insertions(+) create mode 100644 conf/xorg.conf diff --git a/conf/xorg.conf b/conf/xorg.conf new file mode 100644 index 0000000..d5f88b6 --- /dev/null +++ b/conf/xorg.conf @@ -0,0 +1,21 @@ +Section "Device" + Identifier "Configured Video Device" + Driver "dummy" +EndSection + +Section "Monitor" + Identifier "Configured Monitor" + HorizSync 31.5-48.5 + VertRefresh 50-70 +EndSection + +Section "Screen" + Identifier "Default Screen" + Monitor "Configured Monitor" + Device "Configured Video Device" + DefaultDepth 24 + SubSection "Display" + Depth 24 + Modes "1024x800" + EndSubSection +EndSection \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 544ab15..e5be016 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,6 +9,8 @@ pkg_dependencies="xorg xinit dbus-x11 kodi" arm_pkg_dependencies="xserver-xorg-legacy xorg dbus-x11 kodi" +package_check_dependencies="xserver-xorg-video-dummy" + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 654a959..7704be8 100644 --- a/scripts/install +++ b/scripts/install @@ -86,12 +86,20 @@ tmpdir=$(mktemp -d) ynh_setup_source --dest_dir="$tmpdir" --source_id="deb-multimedia-keyring" dpkg -i "$tmpdir/deb-multimedia-keyring.deb" +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + pkg_dependencies="$pkg_dependencies $package_check_dependencies" +fi + if [[ $arch != arm* ]]; then ynh_install_extra_app_dependencies --repo="deb https://www.deb-multimedia.org/ buster main non-free" --package="$pkg_dependencies" else ynh_install_extra_app_dependencies --repo="deb https://www.deb-multimedia.org/ buster main non-free" --package="$arm_pkg_dependencies" fi +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + cp ../conf/xorg.conf /etc/X11/xorg.conf +fi + #================================================= # CREATE DEDICATED USER #================================================= diff --git a/scripts/restore b/scripts/restore index 077c32a..f296461 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,12 +103,20 @@ tmpdir=$(mktemp -d) ynh_setup_source --dest_dir="$tmpdir" --source_id="deb-multimedia-keyring" dpkg -i "$tmpdir/deb-multimedia-keyring.deb" +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + pkg_dependencies="$pkg_dependencies $package_check_dependencies" +fi + if [[ $arch != arm* ]]; then ynh_install_extra_app_dependencies --repo="deb https://www.deb-multimedia.org/ buster main non-free" --package="$pkg_dependencies" else ynh_install_extra_app_dependencies --repo="deb https://www.deb-multimedia.org/ buster main non-free" --package="$arm_pkg_dependencies" fi +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + cp ../conf/xorg.conf /etc/X11/xorg.conf +fi + #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2799397..023c556 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,12 +110,20 @@ tmpdir=$(mktemp -d) ynh_setup_source --dest_dir="$tmpdir" --source_id="deb-multimedia-keyring" dpkg -i "$tmpdir/deb-multimedia-keyring.deb" +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + pkg_dependencies="$pkg_dependencies $package_check_dependencies" +fi + if [[ $arch != arm* ]]; then ynh_install_extra_app_dependencies --repo="deb https://www.deb-multimedia.org/ buster main non-free" --package="$pkg_dependencies" else ynh_install_extra_app_dependencies --repo="deb https://www.deb-multimedia.org/ buster main non-free" --package="$arm_pkg_dependencies" fi +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + cp ../conf/xorg.conf /etc/X11/xorg.conf +fi + #================================================= # SETUP SYSTEMD #=================================================