Message ID | 20211108093259.3309527-1-Vijaikumar_Kanagarajan@mentor.com (mailing list archive) |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | [isar-cip-core] swupdate: Remove superflous patch | expand |
On 08.11.21 10:32, Vijai Kumar K wrote: > Same as 0008-debian-rules-Add-Embedded-Lua-handler-option.patch. > > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> > --- > ...ules-Add-Embedded-Lua-handler-option.patch | 30 ------------------- > 1 file changed, 30 deletions(-) > delete mode 100644 recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch > > diff --git a/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch b/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch > deleted file mode 100644 > index 84665cd..0000000 > --- a/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 0200687ad67d6e5a0e9bbdf2e8c86e3f8e717c5e Mon Sep 17 00:00:00 2001 > -From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > -Date: Wed, 29 Sep 2021 11:32:41 +0200 > -Subject: [PATCH 5/6] debian/rules: Add Embedded Lua handler option > - > -Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > ---- > - debian/rules | 5 +++++ > - 1 file changed, 5 insertions(+) > - > -diff --git a/debian/rules b/debian/rules > -index 69fd790..9ace348 100755 > ---- a/debian/rules > -+++ b/debian/rules > -@@ -52,7 +52,12 @@ ifneq (,$(LUA_VERSION)) > - echo CONFIG_LUAPKG=\"lua$(LUA_VERSION)\" >> configs/debian_defconfig > - echo CONFIG_LUASCRIPTHANDLER=y >> configs/debian_defconfig > - echo CONFIG_HANDLER_IN_LUA=y >> configs/debian_defconfig > -+ifneq (,$(filter pkg.swupdate.embeddedlua,$(DEB_BUILD_PROFILES))) > -+ echo CONFIG_EMBEDDED_LUA_HANDLER=y >> configs/debian_defconfig > -+ echo CONFIG_EMBEDDED_LUA_HANDLER_SOURCE=\"/usr/share/lua/$(LUA_VERSION)/swupdate_handlers.lua\" >> configs/debian_defconfig > - endif > -+endif > -+ > - echo CONFIG_EXTRA_CFLAGS=\"$(CFLAGS) $(CPPFLAGS)\" >> configs/debian_defconfig > - echo CONFIG_EXTRA_LDFLAGS=\"$(LDFLAGS)\" >> configs/debian_defconfig > - echo CONFIG_EXTRA_LDLIBS=\"$(LDLIBS)\" >> configs/debian_defconfig > --- > -2.30.2 > - > Was this ever used, Quirin? Applied, thanks. Jan
On 11/8/21 4:14 PM, Jan Kiszka wrote: > On 08.11.21 10:32, Vijai Kumar K wrote: >> Same as 0008-debian-rules-Add-Embedded-Lua-handler-option.patch. >> >> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> >> --- >> ...ules-Add-Embedded-Lua-handler-option.patch | 30 ------------------- >> 1 file changed, 30 deletions(-) >> delete mode 100644 recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch >> >> diff --git a/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch b/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch >> deleted file mode 100644 >> index 84665cd..0000000 >> --- a/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch >> +++ /dev/null >> @@ -1,30 +0,0 @@ >> -From 0200687ad67d6e5a0e9bbdf2e8c86e3f8e717c5e Mon Sep 17 00:00:00 2001 >> -From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> -Date: Wed, 29 Sep 2021 11:32:41 +0200 >> -Subject: [PATCH 5/6] debian/rules: Add Embedded Lua handler option >> - >> -Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> ---- >> - debian/rules | 5 +++++ >> - 1 file changed, 5 insertions(+) >> - >> -diff --git a/debian/rules b/debian/rules >> -index 69fd790..9ace348 100755 >> ---- a/debian/rules >> -+++ b/debian/rules >> -@@ -52,7 +52,12 @@ ifneq (,$(LUA_VERSION)) >> - echo CONFIG_LUAPKG=\"lua$(LUA_VERSION)\" >> configs/debian_defconfig >> - echo CONFIG_LUASCRIPTHANDLER=y >> configs/debian_defconfig >> - echo CONFIG_HANDLER_IN_LUA=y >> configs/debian_defconfig >> -+ifneq (,$(filter pkg.swupdate.embeddedlua,$(DEB_BUILD_PROFILES))) >> -+ echo CONFIG_EMBEDDED_LUA_HANDLER=y >> configs/debian_defconfig >> -+ echo CONFIG_EMBEDDED_LUA_HANDLER_SOURCE=\"/usr/share/lua/$(LUA_VERSION)/swupdate_handlers.lua\" >> configs/debian_defconfig >> - endif >> -+endif >> -+ >> - echo CONFIG_EXTRA_CFLAGS=\"$(CFLAGS) $(CPPFLAGS)\" >> configs/debian_defconfig >> - echo CONFIG_EXTRA_LDFLAGS=\"$(LDFLAGS)\" >> configs/debian_defconfig >> - echo CONFIG_EXTRA_LDLIBS=\"$(LDLIBS)\" >> configs/debian_defconfig >> --- >> -2.30.2 >> - >> > > Was this ever used, Quirin? It was from a early iteration of the patchset. It was no longer in use in the recipe. > > Applied, thanks. > > Jan > Quirin
diff --git a/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch b/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch deleted file mode 100644 index 84665cd..0000000 --- a/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0200687ad67d6e5a0e9bbdf2e8c86e3f8e717c5e Mon Sep 17 00:00:00 2001 -From: Quirin Gylstorff <quirin.gylstorff@siemens.com> -Date: Wed, 29 Sep 2021 11:32:41 +0200 -Subject: [PATCH 5/6] debian/rules: Add Embedded Lua handler option - -Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> ---- - debian/rules | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/debian/rules b/debian/rules -index 69fd790..9ace348 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -52,7 +52,12 @@ ifneq (,$(LUA_VERSION)) - echo CONFIG_LUAPKG=\"lua$(LUA_VERSION)\" >> configs/debian_defconfig - echo CONFIG_LUASCRIPTHANDLER=y >> configs/debian_defconfig - echo CONFIG_HANDLER_IN_LUA=y >> configs/debian_defconfig -+ifneq (,$(filter pkg.swupdate.embeddedlua,$(DEB_BUILD_PROFILES))) -+ echo CONFIG_EMBEDDED_LUA_HANDLER=y >> configs/debian_defconfig -+ echo CONFIG_EMBEDDED_LUA_HANDLER_SOURCE=\"/usr/share/lua/$(LUA_VERSION)/swupdate_handlers.lua\" >> configs/debian_defconfig - endif -+endif -+ - echo CONFIG_EXTRA_CFLAGS=\"$(CFLAGS) $(CPPFLAGS)\" >> configs/debian_defconfig - echo CONFIG_EXTRA_LDFLAGS=\"$(LDFLAGS)\" >> configs/debian_defconfig - echo CONFIG_EXTRA_LDLIBS=\"$(LDLIBS)\" >> configs/debian_defconfig --- -2.30.2 -
Same as 0008-debian-rules-Add-Embedded-Lua-handler-option.patch. Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> --- ...ules-Add-Embedded-Lua-handler-option.patch | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch