diff options
-rw-r--r-- | mk/image.mk | 1 | ||||
-rw-r--r-- | mk/linux-ver.mk | 28 | ||||
-rw-r--r-- | package/bash/Makefile | 4 | ||||
-rw-r--r-- | package/bcm28xx-bootloader/Makefile | 2 | ||||
-rw-r--r-- | package/cog/Makefile | 8 | ||||
-rw-r--r-- | package/curl/Makefile | 4 | ||||
-rw-r--r-- | package/e2fsprogs/Makefile | 4 | ||||
-rw-r--r-- | package/expat/Makefile | 7 | ||||
-rw-r--r-- | package/font-adobe-100dpi/Makefile | 4 | ||||
-rw-r--r-- | package/font-adobe-75dpi/Makefile | 4 | ||||
-rw-r--r-- | package/font-util/Makefile | 3 | ||||
-rw-r--r-- | package/fontconfig/Makefile | 14 | ||||
-rw-r--r-- | package/freetype/Makefile | 6 | ||||
-rw-r--r-- | package/freetype/patches/patch-include_freetype_config_ftoption_h | 11 | ||||
-rw-r--r-- | package/kexec-tools/Makefile | 6 | ||||
-rw-r--r-- | package/kmod/Makefile | 4 | ||||
-rw-r--r-- | package/lftp/Makefile | 13 | ||||
-rw-r--r-- | package/lftp/patches/patch-src_lftp_ssl_cc | 38 | ||||
-rw-r--r-- | package/libdisplay-info/Makefile | 8 | ||||
-rw-r--r-- | package/libdrm/Makefile | 4 | ||||
-rw-r--r-- | package/libinput/Makefile | 8 | ||||
-rw-r--r-- | package/libpsl/Makefile | 6 | ||||
-rw-r--r-- | package/libsoup3/Makefile | 4 | ||||
-rw-r--r-- | package/libtirpc/Makefile | 4 | ||||
-rw-r--r-- | package/libtirpc/patches/patch-src_auth_none_c | 11 | ||||
-rw-r--r-- | package/libtirpc/patches/patch-src_auth_time_c | 20 | ||||
-rw-r--r-- | package/libtirpc/patches/patch-src_getpublickey_c | 11 | ||||
-rw-r--r-- | package/libtirpc/patches/patch-src_key_call_c | 15 | ||||
-rw-r--r-- | package/libtirpc/patches/patch-src_svc_auth_none_c | 13 | ||||
-rw-r--r-- | package/libwpe/Makefile | 2 | ||||
-rw-r--r-- | package/libxkbcommon/Makefile | 9 | ||||
-rw-r--r-- | package/libxml2/Makefile | 6 | ||||
-rw-r--r-- | package/libxslt/Makefile | 5 | ||||
-rw-r--r-- | package/mesa/Makefile | 3 | ||||
-rw-r--r-- | package/openssh/Makefile | 6 | ||||
-rw-r--r-- | package/util-linux/Makefile | 1 | ||||
-rw-r--r-- | package/wayland-protocols/Makefile | 6 | ||||
-rw-r--r-- | package/weston/Makefile | 16 | ||||
-rw-r--r-- | package/wpebackend-fdo/Makefile | 5 | ||||
-rw-r--r-- | package/wpewebkit/Makefile | 15 | ||||
-rw-r--r-- | package/xf86-video-fbdev/Makefile | 4 | ||||
-rw-r--r-- | package/xorg-server/Makefile | 4 | ||||
-rw-r--r-- | package/xorg-server/patches/patch-configure | 6 | ||||
-rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am | 11 | ||||
-rw-r--r-- | target/config/Config.in.cpu | 32 | ||||
-rw-r--r-- | target/config/Config.in.fpu | 2 | ||||
-rw-r--r-- | target/linux/Config.in.kernelversion | 14 | ||||
-rw-r--r-- | target/linux/patches/5.10.236/arc.patch (renamed from target/linux/patches/5.10.234/arc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.236/darwin-dtc.patch (renamed from target/linux/patches/5.10.234/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.236/dtc-noyaml.patch (renamed from target/linux/patches/5.10.234/dtc-noyaml.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.236/nds32-ag101p.patch (renamed from target/linux/patches/5.10.234/nds32-ag101p.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.236/or1k-more-ram.patch (renamed from target/linux/patches/5.10.234/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.236/relocs.patch (renamed from target/linux/patches/5.10.234/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.10.236/startup.patch (renamed from target/linux/patches/5.10.234/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/darwin-dtc.patch (renamed from target/linux/patches/5.15.178/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/dtc-noyaml.patch (renamed from target/linux/patches/5.15.178/dtc-noyaml.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/enable-ethernet-bpi-m2-plus.patch (renamed from target/linux/patches/5.15.178/enable-ethernet-bpi-m2-plus.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/nds32-ag101p.patch (renamed from target/linux/patches/5.15.178/nds32-ag101p.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/or1k-more-ram.patch (renamed from target/linux/patches/5.15.178/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/relocs.patch (renamed from target/linux/patches/5.15.178/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/rockchip-115200.patch (renamed from target/linux/patches/5.15.178/rockchip-115200.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.15.180/startup.patch (renamed from target/linux/patches/5.15.178/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/arc.patch (renamed from target/linux/patches/5.4.289/arc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/arm-nommu.patch (renamed from target/linux/patches/5.4.289/arm-nommu.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/darwin-dtc.patch (renamed from target/linux/patches/5.4.289/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/dtc-noyaml.patch (renamed from target/linux/patches/5.4.289/dtc-noyaml.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/macsonic.patch (renamed from target/linux/patches/5.4.289/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/or1k-more-ram.patch (renamed from target/linux/patches/5.4.289/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/relocs.patch (renamed from target/linux/patches/5.4.289/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/sh4.patch (renamed from target/linux/patches/5.4.289/sh4.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/5.4.292/startup.patch (renamed from target/linux/patches/5.4.289/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/armnommu-fix-thread-registers.patch (renamed from target/linux/patches/6.1.130/armnommu-fix-thread-registers.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/armnommu-versatile.patch (renamed from target/linux/patches/6.1.130/armnommu-versatile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/board-rockpi4-0003-arm64-dts-pcie.patch (renamed from target/linux/patches/6.1.130/board-rockpi4-0003-arm64-dts-pcie.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/enable-ethernet-bpi-m2-plus.patch (renamed from target/linux/patches/6.1.130/enable-ethernet-bpi-m2-plus.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/hppa-cross-compile.patch (renamed from target/linux/patches/6.1.130/hppa-cross-compile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/macsonic.patch (renamed from target/linux/patches/6.1.130/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/nios2.patch (renamed from target/linux/patches/6.1.130/nios2.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/or1k-more-ram.patch (renamed from target/linux/patches/6.1.130/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/riscv32.patch (renamed from target/linux/patches/6.1.130/riscv32.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/riscv64-flat.patch (renamed from target/linux/patches/6.1.130/riscv64-flat.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/rockchip-115200.patch (renamed from target/linux/patches/6.1.130/rockchip-115200.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.1.135/rockchip-pcie-timeout.patch (renamed from target/linux/patches/6.1.130/rockchip-pcie-timeout.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.12.25/armnommu-versatile.patch (renamed from target/linux/patches/6.12.23/armnommu-versatile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.12.25/hppa-cross-compile.patch (renamed from target/linux/patches/6.12.23/hppa-cross-compile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.12.25/macsonic.patch (renamed from target/linux/patches/6.12.23/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.12.25/mips-vdso-gcc15.patch | 12 | ||||
-rw-r--r-- | target/linux/patches/6.6.88/armnommu-fix-thread-registers.patch (renamed from target/linux/patches/6.6.82/armnommu-fix-thread-registers.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.88/armnommu-versatile.patch (renamed from target/linux/patches/6.6.82/armnommu-versatile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.88/hppa-cross-compile.patch (renamed from target/linux/patches/6.6.82/hppa-cross-compile.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.88/linksys-nslu2.patch (renamed from target/linux/patches/6.6.82/linksys-nslu2.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/6.6.88/macsonic.patch (renamed from target/linux/patches/6.6.82/macsonic.patch) | 0 | ||||
-rw-r--r-- | toolchain/expat/Makefile | 4 | ||||
-rw-r--r-- | toolchain/expat/Makefile.inc | 6 |
94 files changed, 267 insertions, 167 deletions
diff --git a/mk/image.mk b/mk/image.mk index 35adc3ef6..d2059c5cc 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -171,6 +171,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/linux-ver.mk b/mk/linux-ver.mk index 91707f848..bd66affde 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -16,46 +16,46 @@ 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 +KERNEL_FILE_VER:= 6.14.4 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= c5c682a354ea3190139357a57d34a79e5c37221ace823a938e10116b577a2e1b +KERNEL_HASH:= 9452f28d7a0051fba4886712395b484c4c7fcf9f85944a62fd3d97dc923f5339 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.23 +KERNEL_FILE_VER:= 6.12.25 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749 +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/package/bash/Makefile b/package/bash/Makefile index bfed5373c..3d8acfc22 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bash -PKG_VERSION:= 5.2.21 +PKG_VERSION:= 5.2.37 PKG_RELEASE:= 1 -PKG_HASH:= c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 +PKG_HASH:= 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff PKG_DESCR:= bourne-again shell PKG_SECTION:= base/shells PKG_URL:= http://www.gnu.org/software/bash/ diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 83a594ad0..b297779a2 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -66,7 +66,6 @@ ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_CUTDOWN),y) endif printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -ifeq ($(ADK_PACKAGE_KODI),y) ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) printf "dtoverlay=vc4-kms-v3d-pi4\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -75,7 +74,6 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y) printf "dtoverlay=vc4-kms-v3d-pi5\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),) printf "dtoverlay=hifiberry-amp\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt diff --git a/package/cog/Makefile b/package/cog/Makefile index fead4df57..9a22fac0b 100644 --- a/package/cog/Makefile +++ b/package/cog/Makefile @@ -24,13 +24,19 @@ MESON_FLAGS+= -Ddocumentation=false \ -Dmanpages=false \ -Dprograms=true \ -Dwpe_api=2.0 \ - -Dplatforms=drm + -Dplatforms="wayland" CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson cog-install: + $(INSTALL_DIR) $(IDIR_COG)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcogcore.so* \ + $(IDIR_COG)/usr/lib + $(INSTALL_DIR) $(IDIR_COG)/usr/lib/cog/modules + $(CP) $(WRKINST)/usr/lib/cog/modules/* \ + $(IDIR_COG)/usr/lib/cog/modules $(INSTALL_DIR) $(IDIR_COG)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/cog \ $(IDIR_COG)/usr/bin diff --git a/package/curl/Makefile b/package/curl/Makefile index a7c53c947..4ee635110 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 8.12.1 +PKG_VERSION:= 8.13.0 PKG_RELEASE:= 1 -PKG_HASH:= 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202 +PKG_HASH:= 4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025 PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_BUILDDEP:= zlib diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index cfadb30af..b47fe75ed 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.47.1 +PKG_VERSION:= 1.47.2 PKG_RELEASE:= 1 -PKG_HASH:= 5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1 +PKG_HASH:= 08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c PKG_DESCR:= ext2/3/4 filesystem utilities PKG_SECTION:= sys/fs PKG_BUILDDEP:= util-linux diff --git a/package/expat/Makefile b/package/expat/Makefile index b178c115f..d8a723ac9 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -4,13 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= expat -PKG_VERSION:= 2.7.0 +PKG_VERSION:= 2.7.1 PKG_RELEASE:= 1 -PKG_HASH:= 25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1 +PKG_HASH:= 354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30 PKG_DESCR:= xml parsing library PKG_SECTION:= libs/data -PKG_NEEDS:= c++ -PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_7_0/ +PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_7_1/ PKG_LIBNAME:= libexpat PKG_OPTS:= dev diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index a9fcab4ff..cf4f25c08 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-100dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/100dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile index 4f9d4dae9..61dc6568a 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-75dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/75dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-util/Makefile b/package/font-util/Makefile index 5b9289f89..eeb265a28 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -14,8 +14,10 @@ PKG_SITES:= http://www.x.org/releases/individual/font/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk +$(eval $(call HOST_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) |