d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot to 2020.11 (#1051)

Browse Source 
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner
2020-12-03 12:34:02 +01:00
committed by GitHub
parent c9c5f1b3e9
commit a4f5670cd8
38 changed files with 745 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
buildroot/package/s390-tools/0002-osasnmpd-Makefile-fix-cross-compilation.patch Normal file
View File

@@ -0,0 +1,41 @@
From d7faa31a871d14ab02b290bdf2b2fa085766d2ac Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 27 Nov 2020 23:43:15 +0100
Subject: [PATCH] osasnmpd/Makefile: fix cross-compilation
Fix the following build failure by allowing the user to provide
NET_SNMP_CONFIG:
/bin/sh: net-snmp-config: command not found
/home/buildroot/autobuild/run/instance-2/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/9.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: osasnmpd.o: in function `main':
osasnmpd.c:(.text.startup+0xcc): undefined reference to `snmp_log_perror'
Fixes:
- http://autobuild.buildroot.org/results/00796f2ebd5fb0e08ac7a05a9ee566f2bc4bd1c3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/ibm-s390-tools/s390-tools/pull/99]
---
osasnmpd/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/osasnmpd/Makefile b/osasnmpd/Makefile
index 15496b2..8ce0932 100644
--- a/osasnmpd/Makefile
+++ b/osasnmpd/Makefile
@@ -1,9 +1,10 @@
include ../common.mak
-LDLIBS = `net-snmp-config --agent-libs`
+NET_SNMP_CONFIG = net-snmp-config
+LDLIBS = `$(NET_SNMP_CONFIG) --agent-libs`
# On some Linux systems `net-snmp-config --agent-libs` introduces -pie,
# therefore add -fPIC to prevent link failures.
ALL_CFLAGS += -fPIC
-ALL_CFLAGS += `net-snmp-config --cflags`
+ALL_CFLAGS += `$(NET_SNMP_CONFIG) --cflags`
OBJS = ibmOSAMib.o ibmOSAMibUtil.o osasnmpd.o
--
2.29.2

16
buildroot/package/s390-tools/s390-tools.mk
View File

@@ -18,9 +18,13 @@ S390_TOOLS_MAKE_OPTS = \
ifeq ($(BR2_PACKAGE_LIBCURL),y)
S390_TOOLS_DEPENDENCIES += libcurl
S390_TOOLS_MAKE_OPTS += HAVE_CURL=1
S390_TOOLS_MAKE_OPTS += \
HAVE_CURL=1 \
HAVE_LIBCURL=1
else
S390_TOOLS_MAKE_OPTS += HAVE_CURL=0
S390_TOOLS_MAKE_OPTS += \
HAVE_CURL=0 \
HAVE_LIBCURL=0
endif
ifeq ($(BR2_PACKAGE_JSON_C),y)
@@ -72,9 +76,11 @@ else
S390_TOOLS_MAKE_OPTS += HAVE_FUSE=0
endif
ifeq ($(BR2_PACKAGE_PERL_NET_SNMP),y)
S390_TOOLS_DEPENDENCIES += perl-net-snmp
S390_TOOLS_MAKE_OPTS += HAVE_SNMP=1
ifeq ($(BR2_PACKAGE_NETSNMP),y)
S390_TOOLS_DEPENDENCIES += netsnmp
S390_TOOLS_MAKE_OPTS += \
NET_SNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config \
HAVE_SNMP=1
else
S390_TOOLS_MAKE_OPTS += HAVE_SNMP=0
endif