removed packaging patch that went mainline in 0.4 Signed-off-by: Enrico Jorns <[email protected]> ---
Changes since v1: - forgot to remove obsolete 0.3 patch ...le.am-do-not-package-data-rauc-service.sh.patch | 39 ---------------------- patches/rauc-0.3/series | 4 --- rules/rauc.make | 4 +-- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 patches/rauc-0.3/0001-Makefile.am-do-not-package-data-rauc-service.sh.patch delete mode 100644 patches/rauc-0.3/series diff --git a/patches/rauc-0.3/0001-Makefile.am-do-not-package-data-rauc-service.sh.patch b/patches/rauc-0.3/0001-Makefile.am-do-not-package-data-rauc-service.sh.patch deleted file mode 100644 index 7a75907aa..000000000 --- a/patches/rauc-0.3/0001-Makefile.am-do-not-package-data-rauc-service.sh.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Bastian Stender <[email protected]> -Date: Tue, 13 Feb 2018 13:53:35 +0100 -Subject: [PATCH] Makefile.am: do not package data/rauc-service.sh - -Packaging the dbus wrapper script renders the corresponding .in file useless. -@bindir@ is ignored making the systemd service fail if the rauc binary -location differs from the packaging host. - -e119229 ("Makefile.am: do not package data/*.service") fixed this for -all .in files in data until then. This bug was introduced later on. - -Fixes: dcd184d ("dbus: use wrapper when starting rauc service") -Signed-off-by: Bastian Stender <[email protected]> ---- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 93c752f44241..47c350d8d511 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -90,7 +90,7 @@ dbuspolicydir = $(DBUS_POLICYDIR) - dist_dbuspolicy_DATA = data/de.pengutronix.rauc.conf - - dbuswrapperdir = $(libexecdir) --dist_dbuswrapper_SCRIPTS = data/rauc-service.sh -+nodist_dbuswrapper_SCRIPTS = data/rauc-service.sh - - EXTRA_DIST += data/rauc.service.in \ - data/de.pengutronix.rauc.service.in \ -@@ -210,7 +210,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = "--without-systemdunitdir" - CLEANFILES = $(gdbus_installer_generated) \ - $(nodist_systemdunit_DATA) \ - $(nodist_dbussystem_DATA) \ -- $(dist_dbuswrapper_SCRIPTS) \ -+ $(nodist_dbuswrapper_SCRIPTS) \ - data/rauc.service \ - test/empty.dat \ - test/test-results/rauc.*.counts \ diff --git a/patches/rauc-0.3/series b/patches/rauc-0.3/series deleted file mode 100644 index c15be9e72..000000000 --- a/patches/rauc-0.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Makefile.am-do-not-package-data-rauc-service.sh.patch -# cd1816e4885f0563e78bd81d3d65732a - git-ptx-patches magic diff --git a/rules/rauc.make b/rules/rauc.make index a7ecaf0e9..b45e1f705 100644 --- a/rules/rauc.make +++ b/rules/rauc.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc # # Paths and names # -RAUC_VERSION := 0.3 -RAUC_MD5 := 0e3fd03dbbe152fdbdca291007dcc53f +RAUC_VERSION := 0.4 +RAUC_MD5 := 52a8f15e9484d590e6261e9bd453ff76 RAUC := rauc-$(RAUC_VERSION) RAUC_SUFFIX := tar.xz RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX) -- 2.16.1 _______________________________________________ ptxdist mailing list [email protected]
