diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/host-bottom.mk | 3 | ||||
| -rw-r--r-- | mk/image.mk | 4 | ||||
| -rw-r--r-- | mk/kernel-vars.mk | 16 | ||||
| -rw-r--r-- | mk/linux-ver.mk | 4 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
6 files changed, 12 insertions, 23 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 21ba5223f..26526dff9 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -66,6 +66,7 @@ ifeq (${HOST_CONFIG_STYLE},meson) meson setup --prefix $(STAGING_HOST_DIR)/usr \ --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(HOST_MESON_FLAGS) \ + --wrap-mode=nodownload \ $(WRKSRC) $(WRKBUILD) $(MAKE_TRACE) endif ifeq (${HOST_CONFIG_STYLE},perl) @@ -87,7 +88,7 @@ host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${HOST_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) + PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) else ifneq (${HOST_STYLE},manual) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) diff --git a/mk/image.mk b/mk/image.mk index 8459c5f90..405a2b2d5 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -13,6 +13,8 @@ ifeq (${ADK_BINSH_ASH},y) BINSH:=ash else ifeq (${ADK_BINSH_BASH},y) BINSH:=bash +else ifeq (${ADK_BINSH_TOYSH},y) +BINSH:=toysh else ifeq (${ADK_BINSH_SASH},y) BINSH:=sash else ifeq (${ADK_BINSH_HUSH},y) @@ -30,6 +32,8 @@ ifeq (${ADK_ROOTSH_ASH},y) ROOTSH:=/bin/ash else ifeq (${ADK_ROOTSH_BASH},y) ROOTSH:=/bin/bash +else ifeq (${ADK_ROOTSH_TOYSH},y) +ROOTSH:=/bin/toysh else ifeq (${ADK_ROOTSH_SASH},y) ROOTSH:=/bin/sash else ifeq (${ADK_ROOTSH_HUSH},y) diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index ccb090d9d..e65d513f6 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -15,20 +15,8 @@ KERNEL_MAKE_OPTS+= V=1 \ HOSTCC="${HOST_CC}" \ HOSTCXX="${HOST_CXX}" \ SHELL='${SHELL}' \ - CONFIG_SHELL='${SHELL}' - -# regex for relocs needs pcre -ifeq ($(OS_FOR_BUILD),Darwin) -KERNEL_MAKE_OPTS+= HOSTLDFLAGS='-lpcreposix -Wl,-no_pie' -endif - -# non-Linux platforms need elf.h -ifneq ($(OS_FOR_BUILD),Linux) -KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}' -KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${LINUX_DIR}/usr/include -I${LINUX_DIR}/security/selinux/include -I${ADK_TOPDIR}/adk/include -I${LINUX_DIR}/scripts/dtc/libfdt -DKBUILD_NO_NLS' -else -KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS)' -endif + CONFIG_SHELL='${SHELL}' \ + HOSTCFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS)' ifneq ($(ADK_TARGET_KERNEL_LOADADDR),) KERNEL_MAKE_OPTS+= LOADADDR=$(ADK_TARGET_KERNEL_LOADADDR) diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 3527f2564..c750a9fb0 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -16,10 +16,10 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_13),y) -KERNEL_FILE_VER:= 6.13.6 +KERNEL_FILE_VER:= 6.13.9 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= de0053cb413d408f20fd1d5788219951b8a4403e5dac1b1d9032090938acd199 +KERNEL_HASH:= 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) KERNEL_FILE_VER:= 6.12.18 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index abc1e1604..6f9e7ea5a 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -140,11 +140,11 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} @env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE) @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${BUILD_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) + PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) else ifneq ($(filter manual,${BUILD_STYLE}),) env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} do-build $(MAKE_TRACE) else ifeq ($(strip ${BUILD_STYLE}),) - cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + cd ${WRKBUILD} && env ${MAKE_ENV} LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ${MAKE} -f ${MAKE_FILE} \ ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE) else @echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2 diff --git a/mk/vars.mk b/mk/vars.mk index b99230c84..1a35f6251 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -319,11 +319,7 @@ endif # host compiler and linker flags HOST_CPPFLAGS:= -I$(STAGING_HOST_DIR)/usr/include -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib -else HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib -endif ifneq (${ADK_UPDATE_PATCHES_GIT},) PATCH= PATH='${HOST_PATH}' ${BASH} $(SCRIPT_DIR)/patch_git.sh |