Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -0,0 +1,62 @@
|
||||
From 15a324f8c67548f219256a5a75ba8123cc5bdac6 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 4 Mar 2019 21:51:36 +0100
|
||||
Subject: [PATCH] Makefile: fix static build
|
||||
|
||||
Don't build and install lua_swupdate.so if HAVE_LUA isn't set to y
|
||||
otherwise build will fail if the toolchain only suports building static
|
||||
libraries
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/c11c4d26983e0347d96f3dda62e6d72b031967bb
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/sbabic/swupdate/pull/49]
|
||||
---
|
||||
Makefile | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index cfeb9a6..cac99b5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -369,11 +369,15 @@ tools-bins := $(patsubst $(tools-y)/%.c,$(tools-y)/%,$(wildcard $(tools-y)/*.c))
|
||||
tools-bins-unstr:= $(patsubst %,%_unstripped,$(tools-bins))
|
||||
tools-all := $(tools-objs)
|
||||
|
||||
+ifeq ($(HAVE_LUA),y)
|
||||
+lua_swupdate := lua_swupdate.so
|
||||
+endif
|
||||
+
|
||||
shared-dirs := $(shareds-y)
|
||||
shared-libs := $(patsubst %,%/built-in.o, $(shareds-y))
|
||||
shared-all := $(shared-libs)
|
||||
|
||||
-all: swupdate ${tools-bins} lua_swupdate.so
|
||||
+all: swupdate ${tools-bins} ${lua_swupdate}
|
||||
|
||||
# Do modpost on a prelinked vmlinux. The finally linked vmlinux has
|
||||
# relevant sections renamed as per the linker script.
|
||||
@@ -434,7 +438,6 @@ install: all
|
||||
install -d ${DESTDIR}/usr/bin
|
||||
install -d ${DESTDIR}/usr/include
|
||||
install -d ${DESTDIR}/usr/lib
|
||||
- install -d ${DESTDIR}/usr/lib/lua/$(LUAVER)
|
||||
install -m 755 swupdate ${DESTDIR}/usr/bin
|
||||
for i in ${tools-bins};do \
|
||||
install -m 755 $$i ${DESTDIR}/usr/bin; \
|
||||
@@ -443,7 +446,10 @@ install: all
|
||||
install -m 0644 include/swupdate_status.h ${DESTDIR}/usr/include
|
||||
install -m 0644 include/progress_ipc.h ${DESTDIR}/usr/include
|
||||
install -m 0755 ipc/lib.a ${DESTDIR}/usr/lib/libswupdate.a
|
||||
- install -m 0755 lua_swupdate.so $(DESTDIR)/usr/lib/lua/$(LUAVER)
|
||||
+ if [ $(HAVE_LUA) = y ]; then \
|
||||
+ install -d ${DESTDIR}/usr/lib/lua/$(LUAVER); \
|
||||
+ install -m 0755 ${lua_swupdate} $(DESTDIR)/usr/lib/lua/$(LUAVER); \
|
||||
+ fi
|
||||
|
||||
PHONY += run-tests
|
||||
tests: \
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
# Locally calculated
|
||||
sha256 a65884ca18523cde1b0744d952d6f91462dbd4ad07941305f5684c6d4ec833dc swupdate-2018.11.tar.gz
|
||||
sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING
|
||||
sha256 43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478 Licenses/Exceptions
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt
|
||||
sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e Licenses/mit.txt
|
||||
|
||||
@@ -6,8 +6,9 @@
|
||||
|
||||
SWUPDATE_VERSION = 2018.11
|
||||
SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
|
||||
SWUPDATE_LICENSE = GPL-2.0+, LGPL-2.1+, MIT
|
||||
SWUPDATE_LICENSE_FILES = COPYING
|
||||
SWUPDATE_LICENSE = GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT
|
||||
SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \
|
||||
Licenses/lgpl-2.1.txt Licenses/mit.txt
|
||||
|
||||
# swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not
|
||||
# available in all external toolchains, and use CC for linking. Ensure
|
||||
@@ -44,7 +45,7 @@ else
|
||||
SWUPDATE_MAKE_ENV += HAVE_LIBCURL=n
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
|
||||
ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER):$(BR2_STATIC_LIBS),y:)
|
||||
SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf
|
||||
# defines the base name for the pkg-config file ("lua" or "luajit")
|
||||
define SWUPDATE_SET_LUA_VERSION
|
||||
|
||||
Reference in New Issue
Block a user