diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/busybox/0004-udhcp-add-option-211-reboot-time.patch | 49 | ||||
| -rw-r--r-- | package/dropbear/Config.in | 6 | ||||
| -rw-r--r-- | package/dropbear/dropbear.mk | 9 | ||||
| -rw-r--r-- | package/linux-headers/Config.in.host | 13 | ||||
| -rw-r--r-- | package/localedef/0001-Don-t-include-xlocale.h.patch | 50 | ||||
| -rw-r--r-- | package/localedef/0001-HACK-only-build-and-install-localedef.patch | 63 | ||||
| -rw-r--r-- | package/localedef/0002-HACK-accept-old-toolchains.patch | 44 | ||||
| -rw-r--r-- | package/localedef/localedef.hash | 2 | ||||
| -rw-r--r-- | package/localedef/localedef.mk | 43 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 8 |
10 files changed, 223 insertions, 64 deletions
diff --git a/package/busybox/0004-udhcp-add-option-211-reboot-time.patch b/package/busybox/0004-udhcp-add-option-211-reboot-time.patch new file mode 100644 index 0000000000..36fa63e22e --- /dev/null +++ b/package/busybox/0004-udhcp-add-option-211-reboot-time.patch @@ -0,0 +1,49 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jeremy Kerr <jk@ozlabs.org> +Date: Tue, 3 Jul 2018 16:36:13 +1000 +Subject: [PATCH] udhcp: add option 211, "reboot time" + +As defined in RFC 5071. + +Signed-off-by: Jeremy Kerr <jk@ozlabs.org> +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +--- + networking/udhcp/common.c | 2 ++ + networking/udhcp/common.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c +index 52ef875f0..77fb07cdc 100644 +--- a/networking/udhcp/common.c ++++ b/networking/udhcp/common.c +@@ -65,6 +65,7 @@ const struct dhcp_optflag dhcp_optflags[] = { + #endif + { OPTION_STRING , 0xd1 }, /* DHCP_PXE_CONF_FILE */ + { OPTION_STRING , 0xd2 }, /* DHCP_PXE_PATH_PREFIX */ ++ { OPTION_U32 , 0xd3 }, /* DHCP_REBOOT_TIME */ + { OPTION_6RD , 0xd4 }, /* DHCP_6RD */ + { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ + { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ +@@ -133,6 +134,7 @@ const char dhcp_option_strings[] ALIGN1 = + #endif + "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */ + "pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX */ ++ "reboottime" "\0" /* DHCP_REBOOT_TIME */ + "ip6rd" "\0" /* DHCP_6RD */ + "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ + "wpad" "\0" /* DHCP_WPAD */ +diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h +index 50ea9199b..550161934 100644 +--- a/networking/udhcp/common.h ++++ b/networking/udhcp/common.h +@@ -156,6 +156,7 @@ enum { + //#define DHCP_VLAN_PRIORITY 0x85 /* 802.1Q VLAN priority */ + //#define DHCP_PXE_CONF_FILE 0xd1 /* RFC 5071 Configuration File */ + //#define DHCP_PXE_PATH_PREFIX 0xd2 /* RFC 5071 Configuration File */ ++//#define DHCP_REBOOT_TIME 0xd3 /* RFC 5071 Reboot time */ + //#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */ + //#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */ + #define DHCP_END 0xff +-- +2.18.0 + diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 62f77bad9d..f170b010a3 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -28,6 +28,12 @@ config BR2_PACKAGE_DROPBEAR_CLIENT and are therefore always build regardless this setting: dropbear, dropbearkey, dropbearconvert, scp +config BR2_PACKAGE_DROPBEAR_SERVER + bool "dropbear ssh server" + default y + help + Enable the dropbear ssh server, run from init + config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS bool "disable reverse DNS lookups" help diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index a5a8243bd4..4ff35dab40 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -10,7 +10,7 @@ DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause DROPBEAR_LICENSE_FILES = LICENSE DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp -DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) +DROPBEAR_PROGRAMS = $(DROPBEAR_TARGET_BINS) # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This @@ -23,6 +23,11 @@ DROPBEAR_PROGRAMS += dbclient DROPBEAR_TARGET_BINS += dbclient ssh endif +ifeq ($(BR2_PACKAGE_DROPBEAR_SERVER),y) +DROPBEAR_PROGRAMS += dropbear +DROPBEAR_TARGET_BINS += dropbear +endif + DROPBEAR_MAKE = \ $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="$(DROPBEAR_PROGRAMS)" @@ -87,6 +92,7 @@ endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_CUSTOM_PATH +ifeq ($(BR2_PACKAGE_DROPBEAR_SERVER),y) define DROPBEAR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dropbear/dropbear.service \ $(TARGET_DIR)/usr/lib/systemd/system/dropbear.service @@ -103,6 +109,7 @@ endef else DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE endif +endif ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0ead7e538f..68ec531f92 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,9 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - # We are intentionally staying at 4.19 for the next Buildroot - # LTS release (2019.02) - default BR2_KERNEL_HEADERS_4_19 + default BR2_KERNEL_HEADERS_5_0 help Select the kernel version to get headers from. @@ -51,6 +49,10 @@ config BR2_KERNEL_HEADERS_4_20 bool "Linux 4.20.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 +config BR2_KERNEL_HEADERS_5_0 + bool "Linux 5.0.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" help @@ -116,6 +118,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0 + bool "5.0.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20 bool "4.20.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 @@ -292,6 +298,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.14.109" if BR2_KERNEL_HEADERS_4_14 default "4.19.32" if BR2_KERNEL_HEADERS_4_19 default "4.20.17" if BR2_KERNEL_HEADERS_4_20 + default "5.0.2" if BR2_KERNEL_HEADERS_5_0 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/package/localedef/0001-Don-t-include-xlocale.h.patch b/package/localedef/0001-Don-t-include-xlocale.h.patch deleted file mode 100644 index 9a6c2f8e90..0000000000 --- a/package/localedef/0001-Don-t-include-xlocale.h.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Bernhard Walle <bernhard@bwalle.de> -Date: Mon, 2 Oct 2017 16:55:23 +0200 -Subject: [PATCH] Don't include <xlocale.h> - -This header has been removed in glibc 2.26: - -https://abi-laboratory.pro/tracker/changelog/glibc/2.26/log.html - ------------------------- >8 ------------------------ -* The nonstandard header <xlocale.h> has been removed. Most programs should - use <locale.h> instead. If you have a specific need for the definition of - locale_t with no other declarations, please contact - libc-alpha@sourceware.org and explain. ------------------------- 8< ------------------------ - -Signed-off-by: Bernhard Walle <bernhard@bwalle.de> - -Upstream: https://git.pengutronix.de/cgit/ptxdist/tree/patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - eglibc/locale/langinfo.h | 2 +- - eglibc/locale/locale.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/eglibc/locale/langinfo.h b/eglibc/locale/langinfo.h -index 0a5336507196..76707a4584c1 100644 ---- a/eglibc/locale/langinfo.h -+++ b/eglibc/locale/langinfo.h -@@ -589,7 +589,7 @@ extern char *nl_langinfo (nl_item __item) __THROW; - more information. */ - - /* Get locale datatype definition. */ --# include <xlocale.h> -+# include <locale.h> - - /* Just like nl_langinfo but get the information from the locale object L. */ - extern char *nl_langinfo_l (nl_item __item, __locale_t __l); -diff --git a/eglibc/locale/locale.h b/eglibc/locale/locale.h -index 2aa19e76acb2..18be711a2d40 100644 ---- a/eglibc/locale/locale.h -+++ b/eglibc/locale/locale.h -@@ -143,7 +143,7 @@ __END_NAMESPACE_STD - This is a proof-of-concept implementation. */ - - /* Get locale datatype definition. */ --# include <xlocale.h> -+# include_next <locale.h> - - /* Return a reference to a data structure representing a set of locale - datasets. Unlike for the CATEGORY parameter for `setlocale' the diff --git a/package/localedef/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/0001-HACK-only-build-and-install-localedef.patch new file mode 100644 index 0000000000..8d5fefbb82 --- /dev/null +++ b/package/localedef/0001-HACK-only-build-and-install-localedef.patch @@ -0,0 +1,63 @@ +From 3a32e5840048ef7db7858ce324731be7a82ddf90 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 21 May 2018 16:45:02 +0200 +Subject: [PATCH] HACK: only build and install localedef + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +Upstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch?id=47116f66f411d4dadfce42c2fdd6d41b351ccfd4 +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + Rules | 14 ++++++++++---- + locale/Makefile | 6 +++--- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/Rules b/Rules +index 706c8a74..04f3f333 100644 +--- a/Rules ++++ b/Rules +@@ -188,10 +188,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ + $(binaries-all-notests)) + + ifneq "$(strip $(binaries-shared-notests))" "" +-$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \ +- $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ +- $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) +- $(+link) ++$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o ++ $(CC) -o $@ \ ++ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ ++ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ ++ $(filter-out $(addprefix $(csu-objpfx),start.o \ ++ $(start-installed-name))\ ++ $(+preinit) \ ++ $(link-extra-libs) \ ++ $(common-objpfx)libc% $(+postinit),$^) \ ++ $(link-extra-libs) + endif + + ifneq "$(strip $(binaries-shared-tests))" "" +diff --git a/locale/Makefile b/locale/Makefile +index fd997227..a8541593 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -32,13 +32,13 @@ categories = ctype messages monetary numeric time paper name \ + address telephone measurement identification collate + aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ + xlocale localename global-locale coll-lookup +-others = localedef locale ++others = localedef + #others-static = localedef locale +-install-bin = localedef locale ++install-bin = localedef + extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \ + $(locale-modules:=.o) $(lib-modules:=.o) + +-extra-libs = libBrokenLocale ++#extra-libs = libBrokenLocale + extra-libs-others = $(extra-libs) + + libBrokenLocale-routines = broken_cur_max +-- +2.19.2 + diff --git a/package/localedef/0002-HACK-accept-old-toolchains.patch b/package/localedef/0002-HACK-accept-old-toolchains.patch new file mode 100644 index 0000000000..93305093ad --- /dev/null +++ b/package/localedef/0002-HACK-accept-old-toolchains.patch @@ -0,0 +1,44 @@ +From 3781bea6277974169cb64d676aad19d3ff358212 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Thu, 6 Dec 2018 19:10:24 +0100 +Subject: [PATCH] HACK: accept old toolchains + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + configure | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index fde57d63..44082866 100755 +--- a/configure ++++ b/configure +@@ -4519,7 +4519,7 @@ $as_echo_n "checking version of $AS... " >&6; } + ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) ++ 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -4649,7 +4649,7 @@ $as_echo_n "checking version of $LD... " >&6; } + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) ++ 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -5058,7 +5058,7 @@ int + main () + { + +-#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9) ++#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) + #error insufficient compiler + #endif + ; +-- +2.19.2 + diff --git a/package/localedef/localedef.hash b/package/localedef/localedef.hash index ee14fb16b8..cfc8e984fa 100644 --- a/package/localedef/localedef.hash +++ b/package/localedef/localedef.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9a60f7cdab6fb39adf23a12102f2d950d5f07f0cd7e51e85ec327e07440a79c6 localedef-eglibc-2.14.1-r17443-ptx1.tar.bz2 +sha256 877c7b4741501d1762af8ef1a2518bdf2d722947d2e8d48b203e2d83cc600bca glibc-glibc-2.28.tar.gz diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 11d9ba3848..28e2775a59 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -4,19 +4,44 @@ # ################################################################################ -LOCALEDEF_VERSION = 2.14.1-r17443-ptx1 -LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2 -LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src +# Use the same VERSION and SITE as target glibc +LOCALEDEF_VERSION = glibc-2.28 +LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz +LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) -HOST_LOCALEDEF_CONF_OPTS += \ - --prefix=/usr \ - --with-glibc=./eglibc +HOST_LOCALEDEF_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) +HOST_LOCALEDEF_LICENSE_FILES = COPYING COPYING.LIB LICENSES -HOST_LOCALEDEF_CONF_ENV = CFLAGS="$(HOST_CFLAGS) -fgnu89-inline" +# Even though we use the autotools-package infrastructure, we have to override +# the default configure commands for since we have to build out-of-tree, but we +# can't use the same 'symbolic link to configure' used with the gcc packages. +define HOST_LOCALEDEF_CONFIGURE_CMDS + mkdir -p $(@D)/build + # Do the configuration + (cd $(@D)/build; \ + $(HOST_CONFIGURE_OPTS) \ + $(SHELL) $(@D)/configure \ + libc_cv_forced_unwind=yes \ + libc_cv_ssp=no \ + --target=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --with-pkgversion="Buildroot" \ + --without-cvs \ + --disable-profile \ + --without-gd \ + --enable-obsolete-rpc) +endef + +define HOST_LOCALEDEF_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_LOCALEDEF_MAKE_OPTS) \ + -C $(@D)/build locale/others +endef -# The makefile does not implement an install target +# The makefile does not implement an install target for localedef define HOST_LOCALEDEF_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/bin/localedef + $(INSTALL) -D -m 0755 $(@D)/build/locale/localedef $(HOST_DIR)/bin/localedef endef $(eval $(host-autotools-package)) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 13b975ab25..85c0162c93 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1022,6 +1022,14 @@ $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) PACKAGES += $(1) +ifneq ($$($(2)_INSTALL_STAGING)$$($(2)_INSTALL_TARGET),NONO) +PACKAGE_TARGETS += $(1) +endif + +ifeq ($$($(2)_INSTALL_IMAGES),YES) +IMAGE_TARGETS += $(1) +endif + ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) endif |
