diff mbox series

[meta-swupdate,3/3] rescuegui: adjust to sync with SWUpdate

Message ID 1532101495-5540-3-git-send-email-sbabic@denx.de
State Accepted
Headers show
Series [meta-swupdate,1/3] swupdate: check if libgpiod is required | expand

Commit Message

Stefano Babic July 20, 2018, 3:44 p.m. UTC 
If lua_swupdate becomes part of swupdate, drop dependency
from this package.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 recipes-extended/images/swupdate-gui-image.bb |  1 -
 recipes-lua/lua-swupdate/lua-swupdate_git.bb  | 47 ---------------------------
 recipes-support/rescuegui/rescuegui_git.bb    |  4 +--
 3 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 recipes-lua/lua-swupdate/lua-swupdate_git.bb
diff mbox series

Patch

diff --git a/recipes-extended/images/swupdate-gui-image.bb b/recipes-extended/images/swupdate-gui-image.bb
index a327478..2a315ac 100644
--- a/recipes-extended/images/swupdate-gui-image.bb
+++ b/recipes-extended/images/swupdate-gui-image.bb
@@ -11,7 +11,6 @@  IMAGE_INSTALL += " \
 	init-ifupdown \
 	lua \
 	luafilesystem \
-	lua-swupdate \
 	rescuegui \
 	swupdate-tools \
 	tekui \
diff --git a/recipes-lua/lua-swupdate/lua-swupdate_git.bb b/recipes-lua/lua-swupdate/lua-swupdate_git.bb
deleted file mode 100644
index 2028c56..0000000
--- a/recipes-lua/lua-swupdate/lua-swupdate_git.bb
+++ /dev/null
@@ -1,47 +0,0 @@ 
-# Recipe created by recipetool
-# This is the basis of a recipe and may need further editing in order to be fully functional.
-# (Feel free to remove these comments when editing.)
-
-# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
-# your responsibility to verify that the values are complete and correct.
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d9b7e441d51a96b17511ee3be5a75857"
-
-DEPENDS = "lua swupdate"
-
-SRC_URI = "git://github.com/sbabic/lua-swupdate.git;protocol=https"
-
-# Modify these as desired
-PV = "1.0+git${SRCPV}"
-SRCREV = "${AUTOREV}"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = 'DESTDIR=${D} PREFIX=/usr'
-
-FILES_${PN} = "${libdir}"
-
-inherit pkgconfig
-
-# NOTE: the following library dependencies are unknown, ignoring: swupdate
-#       (this is based on recipes that have previously been built and packaged)
-
-# NOTE: this is a Makefile-only piece of software, so we cannot generate much of the
-# recipe automatically - you will need to examine the Makefile yourself and ensure
-# that the appropriate arguments are passed in.
-
-do_configure () {
-	# Specify any needed configure commands here
-	:
-}
-
-do_compile () {
-	# You will almost certainly need to add additional arguments here
-	oe_runmake
-}
-
-do_install () {
-	# This is a guess; additional arguments may be required
-	oe_runmake install
-}
-
diff --git a/recipes-support/rescuegui/rescuegui_git.bb b/recipes-support/rescuegui/rescuegui_git.bb
index def2ee0..126565b 100644
--- a/recipes-support/rescuegui/rescuegui_git.bb
+++ b/recipes-support/rescuegui/rescuegui_git.bb
@@ -7,8 +7,8 @@  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 inherit update-rc.d
 
-DEPENDS += "swupdate lua lua-swupdate luafilesystem"
-RDEPENDS_${PN} += "swupdate-tools"
+DEPENDS += "swupdate lua luafilesystem"
+RDEPENDS_${PN} += "swupdate-tools swupdate-lua"
 
 SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https \
      	   file://rescuegui \