diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | mk/host-bottom.mk | 9 | ||||
| -rw-r--r-- | mk/linux-ver.mk | 36 | ||||
| -rw-r--r-- | mk/linux.mk | 1 |
4 files changed, 26 insertions, 26 deletions
diff --git a/mk/build.mk b/mk/build.mk index 1fe387598..78a3e7709 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -632,13 +632,13 @@ distclean cleandir: endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) $(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c $(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_TOPDIR)/adk/tools/strmap.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c $(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard tasks/*) @printf " ---> generating menu structure.. " diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index f7e635f15..21ba5223f 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -61,8 +61,9 @@ ifeq (${HOST_CONFIG_STYLE},cmake) endif ifeq (${HOST_CONFIG_STYLE},meson) @$(CMD_TRACE) "configuring meson.. " - cd ${WRKSRC}; PATH='${HOST_PATH}' \ - meson --prefix $(STAGING_HOST_DIR)/usr \ + cd ${WRKSRC}; env PATH='${HOST_PATH}' CPPFLAGS='$(HOST_CPPFLAGS)' \ + LDFLAGS='$(HOST_LDFLAGS)' CFLAGS='$(HOST_CFLAGS)' \ + meson setup --prefix $(STAGING_HOST_DIR)/usr \ --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(HOST_MESON_FLAGS) \ $(WRKSRC) $(WRKBUILD) $(MAKE_TRACE) @@ -109,6 +110,10 @@ ifeq (${HOST_INSTALL_STYLE},auto) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${STAGING_HOST_DIR}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif +ifeq (${HOST_INSTALL_STYLE},meson) + DESTDIR='' PATH='$(HOST_PATH)' \ + ninja -C $(WRKBUILD) install $(MAKE_TRACE) +endif ifeq (${HOST_INSTALL_STYLE},manual) env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE) endif diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 1df185d77..ffb055dad 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,53 +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_9),y) -KERNEL_FILE_VER:= 6.9.2 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_10),y) +KERNEL_FILE_VER:= 6.10.7 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= d46c5bdf2c5961cc2a4dedefe0434d456865e95e4a7cd9f93fff054f9090e5f9 -endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_8),y) -KERNEL_FILE_VER:= 6.8.11 -KERNEL_RELEASE:= 1 -KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= b78dcd09f6b725872a2c0c87a70a064b0fbbcccfe5ce60aa46c669934a9e28b6 +KERNEL_HASH:= 900d567ff01824708ce24c3b37faaef03e6f6145411dd447a6ff2edc8c5db3a9 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) -KERNEL_FILE_VER:= 6.6.30 +KERNEL_FILE_VER:= 6.6.48 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 +KERNEL_HASH:= 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y) -KERNEL_FILE_VER:= 6.1.90 +KERNEL_FILE_VER:= 6.1.107 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d +KERNEL_HASH:= f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y) -KERNEL_FILE_VER:= 5.15.158 +KERNEL_FILE_VER:= 5.15.165 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6 +KERNEL_HASH:= a36dd3e82ceb634afded31f2656568f57c4d9c4b399859f298b18116df11c6fe endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y) -KERNEL_FILE_VER:= 5.10.216 +KERNEL_FILE_VER:= 5.10.224 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151 +KERNEL_HASH:= 19b099c67324bba6378e22dc51ad3906e4dcd6a908d137766b4bfa9174ddd11a endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y) -KERNEL_FILE_VER:= 5.4.275 +KERNEL_FILE_VER:= 5.4.282 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= dad2b068946f0ca0026130d7ab17601d5074d90b381379c4479314d4edf4304c +KERNEL_HASH:= 5582770976d33bb7bf9494e0fa0c49f449aa02b0133d00a5a198b6c208dd7de0 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) -KERNEL_FILE_VER:= 4.19.313 +KERNEL_FILE_VER:= 4.19.320 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= a8145e2ecf8437b6d06400c3358a595c47a74443b164890cf12a07d8722539c8 +KERNEL_HASH:= 9d671a12b00301b7ce63022d4e4afa3e40aa318f8f7f25a1147e602fdb1047a1 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y) KERNEL_FILE_VER:= 4.14.334 diff --git a/mk/linux.mk b/mk/linux.mk index 920c1749b..09f62c2da 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -7,6 +7,7 @@ ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y) PKG_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT) PKG_GIT:= $(ADK_TARGET_LINUX_KERNEL_GIT_TYPE) PKG_SITES:= $(ADK_TARGET_LINUX_KERNEL_GIT_REPO) +DISTFILES= $(PKG_NAME)-$(PKG_VERSION).tar.gz else PKG_VERSION:= $(KERNEL_FILE_VER) PKG_SITES:= ${MASTER_SITE_KERNEL:=kernel/v6.x/} \ |