diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/host-bottom.mk | 3 | ||||
| -rw-r--r-- | mk/kernel-vars.mk | 2 | ||||
| -rw-r--r-- | mk/linux-ver.mk | 4 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 |
4 files changed, 6 insertions, 5 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/kernel-vars.mk b/mk/kernel-vars.mk index 475353d6f..ccb090d9d 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -27,7 +27,7 @@ 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_CFLAGS}' +KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS)' endif ifneq ($(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..400a04019 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -140,7 +140,7 @@ ${_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}),) |