Przeglądaj źródła

swupdate: fix build with lua extensions

Add package for Lua extension and fix the build. SWUpdate
Makefile integrates now the install target and it can be simplified
in the recipe.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Stefano Babic 7 lat temu
rodzic
commit
dae0d3e906
1 zmienionych plików z 5 dodań i 11 usunięć
  1. 5 11
      recipes-support/swupdate/swupdate.inc

+ 5 - 11
recipes-support/swupdate/swupdate.inc

@@ -17,13 +17,14 @@ SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https \
      "
 
 INSANE_SKIP_${PN} = "ldflags"
-PACKAGES =+ "${PN}-www"
+PACKAGES =+ "${PN}-www ${PN}-lua"
 
+FILES_${PN}-lua += "${libdir}/lua/"
 FILES_${PN}-www = "/www/*"
 
 S = "${WORKDIR}/git/"
 
-EXTRA_OEMAKE += " HOSTCC="${BUILD_CC}" HOSTCXX="${BUILD_CXX}" V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
+EXTRA_OEMAKE += " HOSTCC="${BUILD_CC}" HOSTCXX="${BUILD_CXX}" LD="${CC}" DESTDIR="${D}" V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
 
 DEPENDS += "kern-tools-native"
 
@@ -112,8 +113,8 @@ do_compile() {
 }
 
 do_install () {
-  install -d ${D}${bindir}/
-  install -m 0755 swupdate ${D}${bindir}/
+
+  oe_runmake install
 
   install -m 0755 -d ${D}/www
   if [ -d ${S}/web-app ];then
@@ -122,13 +123,6 @@ do_install () {
 	install -m 0755 ${S}/www/* ${D}/www
   fi
 
-  install -d ${D}${libdir}/
-  install -d ${D}${includedir}/
-  install -m 0644 ${S}/include/network_ipc.h ${D}${includedir}
-  install -m 0644 ${S}/include/swupdate_status.h ${D}${includedir}
-  install -m 0644 ${S}/include/progress_ipc.h ${D}${includedir}
-  install -m 0755 ${S}/ipc/lib.a ${D}${libdir}/libswupdate.a
-
   install -d ${D}${sysconfdir}/init.d
   install -m 755 ${WORKDIR}/swupdate ${D}${sysconfdir}/init.d