diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 9 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 2 | ||||
| -rw-r--r-- | mk/linux-ver.mk | 30 | ||||
| -rw-r--r-- | mk/mirrors.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 1 |
5 files changed, 23 insertions, 21 deletions
diff --git a/mk/image.mk b/mk/image.mk index 35adc3ef6..f4def3c0a 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -70,12 +70,10 @@ image-prepare-post: rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \ dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \ chmod 600 ${TARGET_DIR}/etc/.rnd - -for dir in X11 truetype; do \ + -for dir in X11 truetype dejavu; do \ if [ -d ${TARGET_DIR}/usr/share/fonts/$${dir} ];then \ - for i in $$(ls ${TARGET_DIR}/usr/share/fonts/$${dir}/);do \ - mkfontdir ${TARGET_DIR}/usr/share/fonts/$${dir}/$${i}; \ - mkfontscale ${TARGET_DIR}/usr/share/fonts/$${dir}/$${i}; \ - done; \ + mkfontdir ${TARGET_DIR}/usr/share/fonts/$${dir}; \ + mkfontscale ${TARGET_DIR}/usr/share/fonts/$${dir}; \ fi; \ done $(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd @@ -171,6 +169,7 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk 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/kernel-build.mk b/mk/kernel-build.mk index 29458abf0..f13bad41a 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -121,7 +121,7 @@ ifneq ($(KERNEL_MODULES_USED),) done $(CMD_TRACE) " done" $(END_TRACE) - $(CP) $(LINUX_BUILD_DIR)/modules/lib/modules/$(KERNEL_VERSION)/modules.{order,builtin} \ + -$(CP) $(LINUX_BUILD_DIR)/modules/lib/modules/$(KERNEL_VERSION)/modules.{order,builtin} \ $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/ endif diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 91707f848..e375752a4 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_14),y) -KERNEL_FILE_VER:= 6.14.2 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_17),y) +KERNEL_FILE_VER:= 6.17.2 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= c5c682a354ea3190139357a57d34a79e5c37221ace823a938e10116b577a2e1b +KERNEL_HASH:= fdebcb065065f5c1b8dc68a6fb59cda50cdddbf9103d207c2196d55ea764f57f endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.23 +KERNEL_FILE_VER:= 6.12.52 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749 +KERNEL_HASH:= b4850cf670a032c70f38b713a27d62046c5f747caf028c5f50b18f98606a9eb1 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/mirrors.mk b/mk/mirrors.mk index dba447fec..4ef464402 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -22,6 +22,8 @@ MASTER_SITE_KERNEL?= \ endif MASTER_SITE_GNU?= \ + https://ftp.fau.de/gnu/ \ + https://ftp.halifax.rwth-aachen.de/gnu/ \ https://ftp.gnu.org/gnu/ \ http://ftp.gnu.org/gnu/ \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index d4b50ff12..e3bae5255 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -70,6 +70,7 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),) $(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake (cd ${WRKBUILD} && PATH='${HOST_PATH}' \ cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \ ${CMAKE_FLAGS} ${WRKSRC}) $(MAKE_TRACE) else ifneq ($(filter minimal,${CONFIG_STYLE}),) |