diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 14 | ||||
| -rw-r--r-- | mk/kernel-vars.mk | 16 | ||||
| -rw-r--r-- | mk/linux-ver.mk | 10 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
5 files changed, 19 insertions, 27 deletions
diff --git a/mk/image.mk b/mk/image.mk index 8459c5f90..35adc3ef6 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) @@ -160,9 +164,13 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk ( \ echo "nod /dev/console 0644 0 0 c 5 1"; \ echo "nod /dev/tty 0644 0 0 c 5 0"; \ - for i in 0 1 2 3 4; do \ - echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \ - done; \ + echo "nod /dev/tty0 0644 0 0 c 4 0"; \ + echo "nod /dev/tty1 0644 0 0 c 4 1"; \ + echo "nod /dev/tty2 0644 0 0 c 4 2"; \ + echo "nod /dev/tty3 0644 0 0 c 4 3"; \ + echo "nod /dev/tty4 0644 0 0 c 4 4"; \ + echo "nod /dev/tty5 0644 0 0 c 4 5"; \ + echo "nod /dev/tty6 0644 0 0 c 4 6"; \ echo "nod /dev/null 0666 0 0 c 1 3"; \ echo "nod /dev/zero 0666 0 0 c 1 5"; \ echo "nod /dev/kmsg 0644 0 0 c 1 11"; \ 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 c750a9fb0..91707f848 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,17 +15,17 @@ KERNEL_FILE_VER:= $(ADK_TARGET_LINUX_KERNEL_GIT) 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.9 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_14),y) +KERNEL_FILE_VER:= 6.14.2 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2 +KERNEL_HASH:= c5c682a354ea3190139357a57d34a79e5c37221ace823a938e10116b577a2e1b endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.18 +KERNEL_FILE_VER:= 6.12.23 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d +KERNEL_HASH:= d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) KERNEL_FILE_VER:= 6.6.82 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 400a04019..6f9e7ea5a 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -144,7 +144,7 @@ ifneq ($(filter meson,${BUILD_STYLE}),) 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 |