mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
From 9fd3c733c645be13a2e39a3bae3983f88530b48d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= <lukas.maerdian@canonical.com>
|
||||
Date: Thu, 7 Jan 2021 12:46:22 +0100
|
||||
Subject: [PATCH] zipl/boot/Makefile: -no-pie is not a valid ld flag
|
||||
|
||||
The "-no-pie" option never has been a valid flag of ld. It breaks the build with newer binutils.
|
||||
See:
|
||||
https://sourceware.org/bugzilla/show_bug.cgi?id=27050
|
||||
https://bugs.launchpad.net/ubuntu/+source/s390-tools/+bug/1907789
|
||||
|
||||
[Retrieved from: https://github.com/ibm-s390-linux/s390-tools/pull/106]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
zipl/boot/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile
|
||||
index a2e5f190..b81df778 100644
|
||||
--- a/zipl/boot/Makefile
|
||||
+++ b/zipl/boot/Makefile
|
||||
@@ -109,7 +109,7 @@ stage3.bin: stage3.exec
|
||||
$< $@
|
||||
|
||||
data.o: $(FILES)
|
||||
- $(LD) $(NO_PIE_LDFLAGS) -r -b binary -o data.o $(FILES)
|
||||
+ $(LD) -r -b binary -o data.o $(FILES)
|
||||
|
||||
data.h: data.o
|
||||
rm -f data.h
|
||||
@@ -7,7 +7,8 @@ config BR2_PACKAGE_S390_TOOLS
|
||||
depends on BR2_s390x
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Tools for use with the s390 Linux kernel and device drivers.
|
||||
|
||||
https://github.com/ibm-s390-tools/s390-tools
|
||||
https://github.com/ibm-s390-linux/s390-tools
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 02171161c3f858e413f777dac542d37328b7b882a7919cfb966ea554bb6ac0b2 s390-tools-2.14.0.tar.gz
|
||||
sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 COPYING
|
||||
sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz
|
||||
sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
S390_TOOLS_VERSION = 2.14.0
|
||||
S390_TOOLS_SITE = $(call github,ibm-s390-tools,s390-tools,v$(S390_TOOLS_VERSION))
|
||||
S390_TOOLS_VERSION = 2.19.0
|
||||
S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION))
|
||||
S390_TOOLS_LICENSE = MIT
|
||||
S390_TOOLS_LICENSE_FILES = LICENSE
|
||||
S390_TOOLS_DEPENDENCIES = zlib
|
||||
|
||||
S390_TOOLS_MAKE_OPTS = \
|
||||
ARCH=$(BR2_ARCH) \
|
||||
@@ -17,9 +18,14 @@ S390_TOOLS_MAKE_OPTS = \
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
S390_TOOLS_DEPENDENCIES += libcurl
|
||||
S390_TOOLS_MAKE_OPTS += HAVE_CURL=1
|
||||
S390_TOOLS_MAKE_OPTS += \
|
||||
CURL_CONFIG=$(STAGING_DIR)/usr/bin/curl-config \
|
||||
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)
|
||||
@@ -50,6 +56,15 @@ else
|
||||
S390_TOOLS_MAKE_OPTS += HAVE_GLIB2=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
||||
S390_TOOLS_DEPENDENCIES += libxml2
|
||||
S390_TOOLS_MAKE_OPTS += \
|
||||
HAVE_LIBXML2=1 \
|
||||
XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
|
||||
else
|
||||
S390_TOOLS_MAKE_OPTS += HAVE_LIBXML2=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
S390_TOOLS_DEPENDENCIES += ncurses
|
||||
S390_TOOLS_MAKE_OPTS += HAVE_NCURSES=1
|
||||
@@ -71,9 +86,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
|
||||
|
||||
Reference in New Issue
Block a user