diff options
Diffstat (limited to 'mk')
-rw-r--r-- | mk/build.mk | 1 | ||||
-rw-r--r-- | mk/host-bottom.mk | 2 | ||||
-rw-r--r-- | mk/host.mk | 2 | ||||
-rw-r--r-- | mk/image.mk | 6 | ||||
-rw-r--r-- | mk/kernel-vars.mk | 17 | ||||
-rw-r--r-- | mk/linux-ver.mk | 24 | ||||
-rw-r--r-- | mk/mirrors.mk | 1 | ||||
-rw-r--r-- | mk/package.mk | 9 | ||||
-rw-r--r-- | mk/pkg-bottom.mk | 3 | ||||
-rw-r--r-- | mk/vars.mk | 12 |
10 files changed, 32 insertions, 45 deletions
diff --git a/mk/build.mk b/mk/build.mk index a3e8c86ae..1fe387598 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -24,7 +24,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_USE_CCACHE=n \ ADK_RUNTIME_START_SERVICES=n \ ADK_PACKAGE_BASE_FILES=y \ - ADK_PACKAGE_DBUS_WITH_SYSTEMD=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 621693ec3..9daf8f7c6 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -56,7 +56,7 @@ endif ifeq (${HOST_CONFIG_STYLE},cmake) @$(CMD_TRACE) "configuring cmake.. " cd ${WRKBUILD}; PATH='${HOST_PATH}' \ - cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=$(STAGING_HOST_DIR)/usr \ ${HOST_CMAKE_FLAGS} ${WRKSRC} $(MAKE_TRACE) endif ifeq (${HOST_CONFIG_STYLE},meson) diff --git a/mk/host.mk b/mk/host.mk index 9ff38ac6f..33c437836 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -15,7 +15,7 @@ HOST_AUTOTOOL_ENV+= PATH='${HOST_PATH}' \ HOST_CONFIGURE_ENV?= PATH='${HOST_PATH}' \ ${COMMON_ENV} \ ${HOST_ENV} \ - PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \ + PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig:${STAGING_HOST_DIR}/usr/lib/${GNU_HOST_NAME}/pkgconfig' \ PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 diff --git a/mk/image.mk b/mk/image.mk index cf870ba48..bc1fe5223 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -78,12 +78,6 @@ image-prepare-post: -rm -f ${TARGET_DIR}/bin/sh ln -sf ${BINSH} ${TARGET_DIR}/bin/sh -ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),y) - ln -fs ../usr/${ADK_TARGET_LIBC_PATH}/systemd/systemd $(TARGET_DIR)/sbin/init - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/poweroff - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/reboot -endif test -z $(GIT) || \ $(GIT) log -1|head -1|sed -e 's#commit ##' \ > $(TARGET_DIR)/etc/.adkgithash diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index a8f80f000..8a5d2053d 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -1,7 +1,15 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -KERNEL_MAKE_OPTS:= V=1 \ +KERNEL_MAKE_OPTS:= CC="$(TARGET_CC)" +ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) +KERNEL_MAKE_OPTS:= CC="$(TARGET_CC) -mno-fdpic" +endif +ifeq ($(ADK_TARGET_ARCH_MICROBLAZE),y) +KERNEL_MAKE_OPTS:= CC="$(TARGET_CC) -fno-tree-loop-distribute-patterns" +endif + +KERNEL_MAKE_OPTS+= V=1 \ ARCH="$(ADK_TARGET_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ HOSTCC="${HOST_CC}" \ @@ -9,13 +17,6 @@ KERNEL_MAKE_OPTS:= V=1 \ SHELL='${SHELL}' \ CONFIG_SHELL='${SHELL}' -ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) -KERNEL_MAKE_OPTS+= CC="$(TARGET_CC) -mno-fdpic" -else -KERNEL_MAKE_OPTS+= CC="$(TARGET_CC)" -endif - - # regex for relocs needs pcre ifeq ($(OS_FOR_BUILD),Darwin) KERNEL_MAKE_OPTS+= HOSTLDFLAGS='-lpcreposix -Wl,-no_pie' diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index b4ed2bc1e..52648efe3 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,17 +15,23 @@ 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_5_15),y) +KERNEL_FILE_VER:= 5.15.23 +KERNEL_RELEASE:= 1 +KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) +KERNEL_HASH:= e839c6fe4db9327178ecccc7fb14035000496bb8028a32735213675eefa97a1c +endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y) -KERNEL_FILE_VER:= 5.10.75 +KERNEL_FILE_VER:= 5.10.100 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 0a2b2f5fefb90773190aaef4726ac363e03992aedc424b0a57eca092d084304b +KERNEL_HASH:= d56965afc9b6a3d26d53db40ccd37fd9d15f2ca6bfd54ef6f0f8b6e92c170999 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y) -KERNEL_FILE_VER:= 5.4.155 +KERNEL_FILE_VER:= 5.4.193 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= cc0c0f902748d251cb22d0e69e3b8d260c447eb0072ef853da15da6cce775038 +KERNEL_HASH:= 0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) KERNEL_FILE_VER:= 4.19.213 @@ -46,10 +52,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= d44128674702529dd26214d6cd1c19542c37c5cc516f352bebbb78f0a9ed97c2 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_4),y) -KERNEL_FILE_VER:= 4.4.289 +KERNEL_FILE_VER:= 4.4.302 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 33196aa3c0487d6d5be14c366fea1fb3d603d66efcf039746f77f3ef819be7bc +KERNEL_HASH:= 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_3_16),y) KERNEL_FILE_VER:= 3.16.85 @@ -63,9 +69,3 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= d7d0ee4588711d4f85ed67b65d447b4bbbe215e600a771fb87a62524b6341c43 endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_3_10_NDS32),y) -KERNEL_FILE_VER:= 3.10-nds32 -KERNEL_RELEASE:= 1 -KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 2f3e06924b850ca4d383ebb6baed154e1bb20440df6f38ca47c33950ec0e05c5 -endif diff --git a/mk/mirrors.mk b/mk/mirrors.mk index a3b36be0b..a8dc27f6a 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -55,6 +55,7 @@ MASTER_SITE_MYSQL?= \ http://mysql.easynet.be/ \ MASTER_SITE_GNOME?= \ + https://download.gnome.org/sources/ \ ftp://ftp.gnome.org/pub/GNOME/sources/ \ ftp://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/ \ ftp://ftp.acc.umu.se/pub/GNOME/sources/ \ diff --git a/mk/package.mk b/mk/package.mk index 96add5789..2a3e1f414 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -224,15 +224,6 @@ endif ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) -@rm -rf $${IDIR_$(1)}/etc/network endif -ifeq (${ADK_RUNTIME_INIT_SYSTEMD},y) - @for file in $$$$(ls ./files/*.service 2>/dev/null); do \ - fname=$$$$(echo $$$$file| sed -e "s#.*/##"); \ - mkdir -p $$(IDIR_$(1))/usr/lib/systemd/system && cp $$$$file $$(IDIR_$(1))/usr/lib/systemd/system/$$$$fname; \ - mkdir -p $$(IDIR_$(1))/etc/systemd/system/multi-user.target.wants; \ - ln -sf ../../../../usr/lib/systemd/system/$$$$fname \ - $$(IDIR_$(1))/etc/systemd/system/multi-user.target.wants; \ - done -endif endif @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}/stamps' \ '$${STAGING_TARGET_DIR}/scripts' diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index b46e381de..424a42ca9 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -55,6 +55,7 @@ else ifneq ($(filter meson,${CONFIG_STYLE}),) (cd ${WRKSRC} && $(MESON_ENV) \ meson --prefix /usr --libdir lib \ --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf \ + --build.pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(MESON_FLAGS) \ $(WRKSRC) $(WRKBUILD)) else ifneq ($(filter cmake,${CONFIG_STYLE}),) @@ -212,7 +213,7 @@ endif ifeq (,$(filter nostaging,${PKG_OPTS})) @-cd ${WRKINST}; \ find usr ! -type d 2>/dev/null | \ - grep -E -v -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' \ + grep -E -v -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' \ -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^usr/lib/.*\.la$$' \ -e '^/usr/lib/libpthread_nonshared.a' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ diff --git a/mk/vars.mk b/mk/vars.mk index bc8b44646..2be0c33cb 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -142,7 +142,7 @@ TARGET_CFLAGS+= -mcpu=$(ADK_TARGET_GCC_CPU) TARGET_CXXFLAGS+= -mcpu=$(ADK_TARGET_GCC_CPU) endif -# for archiectures where gcc --with-arch matches -march= +# for architectures where gcc --with-arch matches -march= ifneq ($(ADK_TARGET_GCC_ARCH),) TARGET_CFLAGS+= -march=$(ADK_TARGET_GCC_ARCH) TARGET_CXXFLAGS+= -march=$(ADK_TARGET_GCC_ARCH) @@ -171,9 +171,9 @@ endif endif ifeq ($(ADK_TARGET_BINFMT_FLAT),y) -TARGET_LDFLAGS+= -Wl,-elf2flt -TARGET_CFLAGS+= -Wl,-elf2flt -TARGET_CXXFLAGS+= -Wl,-elf2flt +TARGET_LDFLAGS+= -Wl,-elf2flt=-r +TARGET_CFLAGS+= -Wl,-elf2flt=-r +TARGET_CXXFLAGS+= -Wl,-elf2flt=-r endif ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y) @@ -242,8 +242,8 @@ TARGET_CXXFLAGS+= -mlongcalls -mauto-litpools endif endif ifeq ($(ADK_TARGET_ARCH_MICROBLAZE),y) -TARGET_CFLAGS+= -mxl-barrel-shift -TARGET_CXXFLAGS+= -mxl-barrel-shift +TARGET_CFLAGS+= -mxl-barrel-shift -fno-tree-loop-distribute-patterns +TARGET_CXXFLAGS+= -mxl-barrel-shift -fno-tree-loop-distribute-patterns endif endif |