diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 11 | ||||
| -rw-r--r-- | mk/linux-ver.mk | 30 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
4 files changed, 29 insertions, 20 deletions
diff --git a/mk/image.mk b/mk/image.mk index 405a2b2d5..d2059c5cc 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -164,9 +164,14 @@ ${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/tty11 0644 0 0 c 4 11"; \ 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/linux-ver.mk b/mk/linux-ver.mk index c750a9fb0..bd66affde 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,47 +15,47 @@ 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.4 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2 +KERNEL_HASH:= 9452f28d7a0051fba4886712395b484c4c7fcf9f85944a62fd3d97dc923f5339 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.18 +KERNEL_FILE_VER:= 6.12.25 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d +KERNEL_HASH:= c8af780f6f613ca24622116e4c512a764335ab66e75c6643003c16e49a8e3b90 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) -KERNEL_FILE_VER:= 6.6.82 +KERNEL_FILE_VER:= 6.6.88 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= f3c2389b8c23cabe747f104a3e434201ca6e7725bbbfb3a8c59a063ac4820e41 +KERNEL_HASH:= 19df89b63ef7e950de7297dabfac0569183bf87636f4c300a25336c7da490650 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y) -KERNEL_FILE_VER:= 6.1.130 +KERNEL_FILE_VER:= 6.1.135 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 9416b2c2d448ec7f54bb0ce5713fb34c32dae4a4edf1abd8cf7a8995cbac66fd +KERNEL_HASH:= e9d17ae1ff96a771e0c5061a50cf9209ce457cf28c8e01165d611523f3957eb9 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y) -KERNEL_FILE_VER:= 5.15.178 +KERNEL_FILE_VER:= 5.15.180 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= efe9f7eb5ea4d26cec6290689343e1804eb3b4a88ff5a60497a696fc08157c42 +KERNEL_HASH:= f51f68b8bbe60aca5e1ff3781f7e5d2ca6a31dd299c8446c39bf880bfff1cd39 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y) -KERNEL_FILE_VER:= 5.10.234 +KERNEL_FILE_VER:= 5.10.236 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 9597c4fee2f1ce452acfec516f4325ad342155872052fd5f0d9ce2ddcc26ebe5 +KERNEL_HASH:= 6da5cc8f7d39ed3acb4d59129a3f1570d981526ebbf58ea82595b7b6e000fb89 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y) -KERNEL_FILE_VER:= 5.4.289 +KERNEL_FILE_VER:= 5.4.292 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 1e3e5fc052c8e15f8eaa37d30bf4f0b3eef7430dd234d9fed0d0005852a06d10 +KERNEL_HASH:= 0bcbf580d1ea623ac5879d0f2d69796c82431b3f653c4749e63766dbf737be85 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) KERNEL_FILE_VER:= 4.19.320 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 6f9e7ea5a..d4b50ff12 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -69,7 +69,7 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),) -e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \ $(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake (cd ${WRKBUILD} && PATH='${HOST_PATH}' \ - cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \ ${CMAKE_FLAGS} ${WRKSRC}) $(MAKE_TRACE) else ifneq ($(filter minimal,${CONFIG_STYLE}),) @@ -168,7 +168,7 @@ ifneq ($(filter meson,${INSTALL_STYLE}),) else ifneq ($(filter manual,${INSTALL_STYLE}),) env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE) else ifeq ($(strip ${INSTALL_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} \ DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE) env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE) else diff --git a/mk/vars.mk b/mk/vars.mk index 1a35f6251..91dfc700e 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -168,6 +168,10 @@ ifeq ($(ADK_TARGET_ARCH_MIPS),y) TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float endif +ifeq ($(ADK_TARGET_ARCH_OR1K),y) +TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float +TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float +endif endif ifeq ($(ADK_TARGET_BINFMT_FLAT),y) |