diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2024-01-13 14:19:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-01-18 06:17:13 +0100 |
| commit | e69f684dedb4a693e38fc8b948cdff8c7601674c (patch) | |
| tree | f65f0118178c9e288f945d4bc813ae8a49dbce0d /package | |
| parent | 1e8ce0775190cbff163cf2d8e42bea16ba1669e7 (diff) | |
support nommu with ELF binaries
Diffstat (limited to 'package')
| -rw-r--r-- | package/busybox/config/Config.in | 4 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-tools_Makefile | 23 | ||||
| -rw-r--r-- | package/uclibc-ng/Makefile | 4 |
3 files changed, 16 insertions, 15 deletions
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 6f19502f4..d5cbed6a5 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -371,7 +371,7 @@ config BUSYBOX_STATIC config BUSYBOX_PIE bool "Build position independent executable" - default n + default y if !ADK_TARGET_WITH_MMU && ADK_TARGET_BINFMT_ELF depends on !BUSYBOX_STATIC help Hardened code option. PIE binaries are loaded at a different @@ -382,7 +382,7 @@ config BUSYBOX_PIE config BUSYBOX_NOMMU bool "Force NOMMU build" - default n + default y if !ADK_TARGET_WITH_MMU help Busybox tries to detect whether architecture it is being built against supports MMU or not. If this detection fails, diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile index c94bd2ada..fc284ad58 100644 --- a/package/u-boot/patches/patch-tools_Makefile +++ b/package/u-boot/patches/patch-tools_Makefile @@ -1,14 +1,11 @@ ---- u-boot-2023.07.02.orig/tools/Makefile 2023-07-11 17:20:44.000000000 +0200 -+++ u-boot-2023.07.02/tools/Makefile 2023-09-29 15:53:47.464079598 +0200 -@@ -172,9 +172,9 @@ endif - # MXSImage needs LibSSL - ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),) - HOSTCFLAGS_kwbimage.o += \ -- $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "") -+ $(shell echo "-lssl -lcrypto") - HOSTLDLIBS_mkimage += \ -- $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") -+ $(shell echo "-lssl -lcrypto") +--- u-boot-2024.01.orig/tools/Makefile 2024-01-08 16:37:48.000000000 +0100 ++++ u-boot-2024.01/tools/Makefile 2024-01-17 17:56:21.004096375 +0100 +@@ -250,7 +250,7 @@ HOSTLDLIBS_mkeficapsule += \ + $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls") + HOSTLDLIBS_mkeficapsule += \ + $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid") +-hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule ++#hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule - # OS X deprecate openssl in favour of CommonCrypto, supress deprecation - # warnings on those systems + mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o + HOSTLDLIBS_mkfwumdata += -luuid diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index ccc5846a1..bc99abc5f 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -31,6 +31,10 @@ uclibc-ng-install: -$(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc*.so* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) -$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) -$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-*.so $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_TARGET_BINFMT_ELF)$(ADK_TARGET_WITH_MMU),y) + $(CP) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/lib/ld*-uClibc*.so* \ + $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) +endif ifeq ($(ADK_TARGET_ARCH_CSKY),y) cd $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) && \ ln -sf ld-uClibc.so.0 ld.so.1 |