From c7b67170808f62df6288a0e809b8d280107e15fb Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 17 Sep 2013 17:57:02 +0200 Subject: [PATCH] - update patch spec file for install post script. Conflicts: meta-wrt-tizen/recipes-wrt/bundle/bundle-extraconf.inc proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-widgets-yocto.spec.patch --- .../recipes-wrt/app-core/app-core-extraconf.inc | 1 + .../libslp-location/libslp-location-extraconf.inc | 5 ++- .../specfile-patch/ail-yocto.spec.patch | 20 +++++++++ .../specfile-patch/alarm-manager-yocto.spec.patch | 29 ++++++------ .../specfile-patch/aul-1-yocto.spec.patch | 24 +++++++++- .../libslp-location-yocto.spec.patch | 23 ++++++++++ .../specfile-patch/notification-yocto.spec.patch | 35 +++++++++++++++ .../specfile-patch/ui-gadget-1-yocto.spec.patch | 15 +++++++ .../specfile-patch/vconf-yocto.spec.patch | 20 +++++++++ .../specfile-patch/webkit2-efl-yocto.spec.patch | 16 +++++++ .../specfile-patch/wrt-commons.spec.patch | 51 +++++++++++++++++++++- .../specfile-patch/wrt-installer.spec.patch | 25 ++++++++++- .../wrt-plugins-common-yocto.spec.patch | 18 +++++++- .../specfile-patch/wrt-security-yocto.spec.patch | 20 ++++++++- .../specfile-patch/wrt-widgets-yocto.spec.patch | 15 +++++++ .../specfile-patch/wrt-yocto.spec.patch | 28 +++++++++++- 16 files changed, 325 insertions(+), 20 deletions(-) create mode 100644 proto-meta-Tizen_ivi_3.0/specfile-patch/ail-yocto.spec.patch create mode 100644 proto-meta-Tizen_ivi_3.0/specfile-patch/libslp-location-yocto.spec.patch create mode 100644 proto-meta-Tizen_ivi_3.0/specfile-patch/notification-yocto.spec.patch create mode 100644 proto-meta-Tizen_ivi_3.0/specfile-patch/ui-gadget-1-yocto.spec.patch create mode 100644 proto-meta-Tizen_ivi_3.0/specfile-patch/vconf-yocto.spec.patch create mode 100644 proto-meta-Tizen_ivi_3.0/specfile-patch/webkit2-efl-yocto.spec.patch create mode 100644 proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-widgets-yocto.spec.patch diff --git a/meta-wrt-tizen/recipes-wrt/app-core/app-core-extraconf.inc b/meta-wrt-tizen/recipes-wrt/app-core/app-core-extraconf.inc index e69de29..777efcb 100644 --- a/meta-wrt-tizen/recipes-wrt/app-core/app-core-extraconf.inc +++ b/meta-wrt-tizen/recipes-wrt/app-core/app-core-extraconf.inc @@ -0,0 +1 @@ +PKG_app-core-efl = "app-core-efl" \ No newline at end of file diff --git a/meta-wrt-tizen/recipes-wrt/libslp-location/libslp-location-extraconf.inc b/meta-wrt-tizen/recipes-wrt/libslp-location/libslp-location-extraconf.inc index a556d9c..9611f31 100644 --- a/meta-wrt-tizen/recipes-wrt/libslp-location/libslp-location-extraconf.inc +++ b/meta-wrt-tizen/recipes-wrt/libslp-location/libslp-location-extraconf.inc @@ -1 +1,4 @@ -EXTRA_OECONF_LAST = "--build=${BUILD_SYS} --host=${HOST_SYS}" \ No newline at end of file +EXTRA_OECONF_LAST = "--build=${BUILD_SYS} --host=${HOST_SYS}" + +PKG_libslp-location-devel= "libslp-location-devel" +PKG_libslp-location= "libslp-location" \ No newline at end of file diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/ail-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/ail-yocto.spec.patch new file mode 100644 index 0000000..c90f56d --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/ail-yocto.spec.patch @@ -0,0 +1,20 @@ +diff --git a/packaging/ail.spec b/packaging/ail.spec +index 6158bcd..ca83a5a 100755 +--- a/packaging/ail.spec ++++ b/packaging/ail.spec +@@ -45,6 +45,7 @@ mkdir -p %{buildroot}/opt/dbspace/ + mkdir -p %{buildroot}/opt/share/applications/ + + %post ++if test "x$D" = "x"; then + vconftool set -t string db/ail/ail_info "0" -f + vconftool set -t string db/menuscreen/desktop "0" -f + vconftool set -t string db/menu_widget/language "en_US.utf8" -f +@@ -69,6 +70,7 @@ update_DAC_for_db_file() + ail_initdb + update_DAC_for_db_file /opt/dbspace/.app_info.db + update_DAC_for_db_file /opt/dbspace/.app_info.db-journal ++fi + + %postun + if [ $1 == 0 ]; then diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/alarm-manager-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/alarm-manager-yocto.spec.patch index 9c55e74..6c0fc84 100644 --- a/proto-meta-Tizen_ivi_3.0/specfile-patch/alarm-manager-yocto.spec.patch +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/alarm-manager-yocto.spec.patch @@ -1,18 +1,21 @@ diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec -index ac7894c..c341eee 100755 +index ac7894c..37a961f 100755 --- a/packaging/alarm-manager.spec +++ b/packaging/alarm-manager.spec -@@ -10,10 +10,10 @@ Source102: 60-alarm-manager-rtc.rules - Source103: alarm-service.conf +@@ -107,6 +107,7 @@ if [ $1 == 0 ]; then + fi - Requires(post): /sbin/ldconfig --Requires(post): /usr/bin/systemctl -+Requires(post): /bin/systemctl - Requires(postun): /sbin/ldconfig --Requires(postun): /usr/bin/systemctl --Requires(preun): /usr/bin/systemctl -+Requires(postun): /bin/systemctl -+Requires(preun): /bin/systemctl + %post -n alarm-server ++if test "x$D" = "x"; then + /sbin/ldconfig - BuildRequires: pkgconfig(dbus-1) - BuildRequires: pkgconfig(glib-2.0) + vconftool set -t int db/system/timechange 0 +@@ -118,6 +119,8 @@ if [ $1 == 1 ]; then + systemctl restart alarm-server.service + fi + ++fi ++ + %postun -n alarm-server + /sbin/ldconfig + systemctl daemon-reload diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/aul-1-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/aul-1-yocto.spec.patch index 4dfb0b0..9500fc1 100644 --- a/proto-meta-Tizen_ivi_3.0/specfile-patch/aul-1-yocto.spec.patch +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/aul-1-yocto.spec.patch @@ -1,5 +1,5 @@ diff --git a/packaging/aul.spec b/packaging/aul.spec -index ff9ea2a..49a5485 100644 +index ff9ea2a..2115dfb 100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -15,10 +15,10 @@ Source104: ac_user.service @@ -16,3 +16,25 @@ index ff9ea2a..49a5485 100644 BuildRequires: cmake BuildRequires: pkgconfig(dbus-glib-1) +@@ -112,8 +112,11 @@ if [ $1 == 0 ]; then + fi + %endif + ++ + %post +-/sbin/ldconfig ++#!/bin/sh ++if test "x$D" = "x"; then ++ldconfig + systemctl daemon-reload + %if !%{with multi_user} + if [ $1 == 1 ]; then +@@ -121,6 +124,8 @@ if [ $1 == 1 ]; then + systemctl restart ac.service + fi + %endif ++fi ++ + + %postun + /sbin/ldconfig diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/libslp-location-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/libslp-location-yocto.spec.patch new file mode 100644 index 0000000..88e9ad4 --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/libslp-location-yocto.spec.patch @@ -0,0 +1,23 @@ +diff --git a/packaging/libslp-location.spec b/packaging/libslp-location.spec +index f618420..df0706a 100755 +--- a/packaging/libslp-location.spec ++++ b/packaging/libslp-location.spec +@@ -48,7 +48,9 @@ make %{?jobs:-j%jobs} + + + %post +-/sbin/ldconfig ++#!/bin/sh ++if test "x$D" != "x"; then ++ldconfig + vconftool set -t int db/location/last/gps/Timestamp "0" -f + vconftool set -t double db/location/last/gps/Latitude "0.0" -f + vconftool set -t double db/location/last/gps/Longitude "0.0" -f +@@ -67,6 +69,7 @@ vconftool set -t double db/location/last/wps/Direction "0.0" -f + vconftool set -t int db/location/setting/GpsEnabled "0" -g 6514 -f + vconftool set -t int db/location/setting/AgpsEnabled "0" -g 6514 -f + vconftool set -t int db/location/setting/NetworkEnabled "0" -g 6514 -f ++fi + + %postun -p /sbin/ldconfig + diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/notification-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/notification-yocto.spec.patch new file mode 100644 index 0000000..d79515d --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/notification-yocto.spec.patch @@ -0,0 +1,35 @@ +diff --git a/packaging/notification.spec b/packaging/notification.spec +index 7a0ffcd..4d3bd1a 100755 +--- a/packaging/notification.spec ++++ b/packaging/notification.spec +@@ -47,8 +47,8 @@ make %{?jobs:-j%jobs} + %make_install + + %post +-/sbin/ldconfig +- ++ldconfig ++if test "x$D" = "x"; then + if [ ! -f /opt/dbspace/.notification.db ] + then + sqlite3 /opt/dbspace/.notification.db 'PRAGMA journal_mode = PERSIST; +@@ -130,12 +130,15 @@ then + ); + ' + fi ++fi ++chown :5000 ${D}/opt/dbspace/.notification.db ++chown :5000 ${D}/opt/dbspace/.notification.db-journal ++chmod 660 ${D}/opt/dbspace/.notification.db ++chmod 660 ${D}/opt/dbspace/.notification.db-journal + +-chown :5000 /opt/dbspace/.notification.db +-chown :5000 /opt/dbspace/.notification.db-journal +-chmod 660 /opt/dbspace/.notification.db +-chmod 660 /opt/dbspace/.notification.db-journal ++if test "x$D" = "x"; then + vconftool set -t string memory/private/libstatus/message "" -i -g 5000 ++fi + + %postun -p /sbin/ldconfig + diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/ui-gadget-1-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/ui-gadget-1-yocto.spec.patch new file mode 100644 index 0000000..7d10f3c --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/ui-gadget-1-yocto.spec.patch @@ -0,0 +1,15 @@ +diff --git a/packaging/ui-gadget-1.spec b/packaging/ui-gadget-1.spec +index 6533105..da81953 100755 +--- a/packaging/ui-gadget-1.spec ++++ b/packaging/ui-gadget-1.spec +@@ -46,8 +46,8 @@ rm -rf %{buildroot} + %make_install + + %post +-/sbin/ldconfig +-ln -sf /usr/bin/ug-client /usr/bin/ug-launcher ++ldconfig ++ln -sf /usr/bin/ug-client ${D}/usr/bin/ug-launcher + + %postun -p /sbin/ldconfig + diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/vconf-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/vconf-yocto.spec.patch new file mode 100644 index 0000000..953cfa8 --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/vconf-yocto.spec.patch @@ -0,0 +1,20 @@ +diff --git a/packaging/vconf.spec b/packaging/vconf.spec +index ee3e3a3..11a23ae 100755 +--- a/packaging/vconf.spec ++++ b/packaging/vconf.spec +@@ -69,9 +69,12 @@ mkdir -p %{buildroot}/usr/share/license + install LICENSE.APLv2 %{buildroot}/usr/share/license/%{name} + + %post +-/sbin/ldconfig +-systemctl daemon-reload +- ++ldconfig ++#!/bin/sh ++if test "x$D" != "x"; then ++ systemctl daemon-reload ++fi ++ + %postun + /sbin/ldconfig + systemctl daemon-reload diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/webkit2-efl-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/webkit2-efl-yocto.spec.patch new file mode 100644 index 0000000..404e227 --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/webkit2-efl-yocto.spec.patch @@ -0,0 +1,16 @@ +diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec +index 4513eef..6ee671f 100644 +--- a/packaging/webkit2-efl.spec ++++ b/packaging/webkit2-efl.spec +@@ -216,9 +216,9 @@ cp ./bin/MiniBrowser %{buildroot}%{_bindir}/MiniBrowser + #!/bin/sh + #change file permissions + # 1. libraries +-chmod 644 %{_libdir}/libewebkit2.so ++chmod 644 ${D}%{_libdir}/libewebkit2.so + # 2. Resources +-chmod 644 /usr/share/edje/webkit.edj ++chmod 644 ${D}/usr/share/edje/webkit.edj + + %postun + diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-commons.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-commons.spec.patch index 98b4e20..9c342d5 100644 --- a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-commons.spec.patch +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-commons.spec.patch @@ -1,5 +1,5 @@ diff --git a/packaging/wrt-commons.spec b/packaging/wrt-commons.spec -index 6e4b6b4..e53231c 100644 +index 6e4b6b4..c7ead3e 100644 --- a/packaging/wrt-commons.spec +++ b/packaging/wrt-commons.spec @@ -1,3 +1,8 @@ @@ -23,3 +23,52 @@ index 6e4b6b4..e53231c 100644 %build %cmake . -DVERSION=%{version} \ +@@ -63,13 +65,14 @@ make %{?jobs:-j%jobs} + %postun -p /sbin/ldconfig + + %post +-/sbin/ldconfig +-mkdir -p /opt/share/widget/system +-mkdir -p /opt/share/widget/user +-mkdir -p /opt/share/widget/exec +-mkdir -p /opt/share/widget/data/Public +-mkdir -p %{_libdir}/wrt-plugins +- ++ldconfig ++mkdir -p ${D}/opt/share/widget/system ++mkdir -p ${D}/opt/share/widget/user ++mkdir -p ${D}/opt/share/widget/exec ++mkdir -p ${D}/opt/share/widget/data/Public ++mkdir -p ${D}%{_libdir}/wrt-plugins ++ ++if test "x$D" = "x"; then + if [ -z ${2} ]; then + echo "This is new install of wrt-commons" + echo "Calling /usr/bin/wrt_commons_create_clean_db.sh" +@@ -95,14 +98,14 @@ else + /usr/bin/wrt_commons_reset_db.sh + fi + fi +- +-mkdir -p /usr/etc/ace +-mkdir -p /usr/apps/org.tizen.policy ++fi ++mkdir -p ${D}/usr/etc/ace ++mkdir -p ${D}/usr/apps/org.tizen.policy + + # DBUS services fix + # WARNING: THIS IS TEMPORARY SOLUTION, AS THIS SHOULD NOT BE OUR + # RESPONSIBILITY!!! WE HAVE TO CONTACT TO DBUS MAINAINERS +- ++if test "x$D" = "x"; then + if [ -f /var/lib/dbus/machine-id ]; then + echo "machine-id exists" + else +@@ -121,6 +124,7 @@ fi + # Set Smack label for db files + + echo "[WRT] wrt-commons postinst done ..." ++fi + + %files + %manifest %{name}.manifest diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-installer.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-installer.spec.patch index 2cfa4db..5074bde 100644 --- a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-installer.spec.patch +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-installer.spec.patch @@ -1,5 +1,5 @@ diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec -index 8427dad..54808ed 100644 +index 8427dad..3433aa3 100644 --- a/packaging/wrt-installer.spec +++ b/packaging/wrt-installer.spec @@ -1,3 +1,8 @@ @@ -28,3 +28,26 @@ index 8427dad..54808ed 100644 LDFLAGS="$LDFLAGS" %cmake . -DCMAKE_INSTALL_PREFIX=/usr \ +@@ -101,17 +103,17 @@ ln -s ../wrt-preinstall-widgets.service %{buildroot}%{_unitdir_user}/tizen-mobil + rm -rf %{buildroot} + + %post +-/sbin/ldconfig +-chmod +s /usr/bin/wrt-installer ++ldconfig ++chmod +s ${D}/usr/bin/wrt-installer + + #symlink for package manager +-ln -sf /usr/bin/wrt-installer /usr/etc/package-manager/backend/wgt ++ln -sf /usr/bin/wrt-installer ${D}/usr/etc/package-manager/backend/wgt + + #for booting recovery +-mkdir -p /opt/share/widget/temp_info ++mkdir -p ${D}/opt/share/widget/temp_info + + # for downloadable Application icons path +-mkdir -p /opt/share/icons/default/small ++mkdir -p ${D}/opt/share/icons/default/small + + %postun -p /sbin/ldconfig + diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-plugins-common-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-plugins-common-yocto.spec.patch index cf75a09..a12ccc8 100644 --- a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-plugins-common-yocto.spec.patch +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-plugins-common-yocto.spec.patch @@ -1,5 +1,5 @@ diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec -index 89ef703..e50008b 100644 +index 89ef703..3e9136d 100644 --- a/packaging/wrt-plugins-common.spec +++ b/packaging/wrt-plugins-common.spec @@ -1,3 +1,8 @@ @@ -27,3 +27,19 @@ index 89ef703..e50008b 100644 %cmake . -DDPL_LOG="ON" \ -DCMAKE_PROJECT_VERSION=%{version} \ +@@ -61,10 +63,11 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} + rm -rf %{buildroot} + + %post +-mkdir -p %{_libdir}/wrt-plugins +-mkdir -p /usr/etc/wrt/injected-javascript +-touch /opt/share/widget/plugin-installation-required +-/sbin/ldconfig ++ ++mkdir -p ${D}%{_libdir}/wrt-plugins ++mkdir -p ${D}/usr/etc/wrt/injected-javascript ++touch ${D}/opt/share/widget/plugin-installation-required ++ldconfig + + %postun -p /sbin/ldconfig + diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-security-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-security-yocto.spec.patch index da9fe93..87eec88 100644 --- a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-security-yocto.spec.patch +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-security-yocto.spec.patch @@ -1,5 +1,5 @@ diff --git a/packaging/wrt-security.spec b/packaging/wrt-security.spec -index 10f2902..c8a3ee1 100644 +index 10f2902..2987cd3 100644 --- a/packaging/wrt-security.spec +++ b/packaging/wrt-security.spec @@ -54,7 +54,7 @@ Certificates for wrt. @@ -11,3 +11,21 @@ index 10f2902..c8a3ee1 100644 %cmake . -DDPL_LOG="ON" \ -DVERSION=%{version} \ +@@ -81,6 +81,8 @@ ln -sf %{_unitdir}/wrt-security-daemon.service %{buildroot}%{_unitdir}/multi-use + rm -rf %{buildroot} + + %post ++if test "x$D" = "x"; then ++ + if [ -z ${2} ]; then + echo "This is new install of wrt-security" + echo "Calling /usr/bin/wrt_security_create_clean_db.sh" +@@ -110,6 +112,8 @@ fi + /sbin/ldconfig + echo "[WRT] wrt-security postinst done ..." + ++fi ++ + %postun + /sbin/ldconfig + diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-widgets-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-widgets-yocto.spec.patch new file mode 100644 index 0000000..6e601ee --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-widgets-yocto.spec.patch @@ -0,0 +1,15 @@ +diff --git a/packaging/wrt-widgets.spec b/packaging/wrt-widgets.spec +index d83c290..945b6d6 100644 +--- a/packaging/wrt-widgets.spec ++++ b/packaging/wrt-widgets.spec +@@ -11,8 +11,8 @@ Requires: wrt-commons + Requires: wrt-installer + Requires: wrt-plugins-tizen + Requires: wrt-security +-Requires: daemon-launch-config-pc +-Requires: dbus-config-pc ++#Requires: daemon-launch-config-pc ++#Requires: dbus-config-pc + Requires: libprivilege-control-conf + + %description diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-yocto.spec.patch index 7c8ff10..94dd751 100644 --- a/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-yocto.spec.patch +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/wrt-yocto.spec.patch @@ -1,5 +1,5 @@ diff --git a/packaging/wrt.spec b/packaging/wrt.spec -index eb3b43a..138dff5 100644 +index eb3b43a..8f6f72a 100644 --- a/packaging/wrt.spec +++ b/packaging/wrt.spec @@ -1,3 +1,8 @@ @@ -27,3 +27,29 @@ index eb3b43a..138dff5 100644 %cmake . -DDPL_LOG="ON" \ -DPROJECT_VERSION=%{version} \ +@@ -177,9 +179,13 @@ fi + rm -rf %{buildroot} + + %post +-/sbin/ldconfig +-chmod +s /usr/bin/wrt-launcher ++#!/bin/sh ++ ++ldconfig + ++chmod +s $D/usr/bin/wrt-launcher ++ ++if test "x$D" = "x"; then + ## wrt-launchpad-daemon ####################################################### + #systemd + /sbin/ldconfig +@@ -190,8 +196,7 @@ if [ $1 == 1 ]; then + %else + systemctl restart wrt_launchpad_daemon@app.service + %endif +- +- ++fi + fi + ############################################################################### + -- 2.7.4