diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/glibc/Makefile | 6 | ||||
| -rw-r--r-- | package/xfsprogs/Makefile | 4 | ||||
| -rw-r--r-- | package/xfsprogs/patches/patch-libxfs_Makefile | 6 | ||||
| -rw-r--r-- | package/xfsprogs/patches/patch-spaceman_Makefile | 13 |
4 files changed, 21 insertions, 8 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 96ae9fa63..c7df87f66 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -48,14 +48,14 @@ ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) for file in libc libpthread librt libcrypt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done else # libnss_* required at runtime even for static builds ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) for file in libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done endif ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin @@ -99,7 +99,7 @@ endif ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib -for file in libpthread librt libcrypt libdl libm libresolv libutil; do \ - cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VERSION).so $$file.so; \ + cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_GLIBCVER).so $$file.so; \ done # header package ${KERNEL_MAKE_ENV} \ diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 245abcc59..d66c24402 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= xfsprogs -PKG_VERSION:= 4.11.0 +PKG_VERSION:= 4.13.1 PKG_RELEASE:= 1 -PKG_HASH:= c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 +PKG_HASH:= 8c64d349d191e24c84eeb1611be767e4a11b81016bd5b73f3a20a0bf39dd3536 PKG_DESCR:= utilities for xfs filesystems PKG_SECTION:= sys/fs PKG_DEPENDS:= libuuid libblkid libncurses diff --git a/package/xfsprogs/patches/patch-libxfs_Makefile b/package/xfsprogs/patches/patch-libxfs_Makefile index 0983e2947..2f38b240f 100644 --- a/package/xfsprogs/patches/patch-libxfs_Makefile +++ b/package/xfsprogs/patches/patch-libxfs_Makefile @@ -1,5 +1,5 @@ ---- xfsprogs-4.11.0.orig/libxfs/Makefile 2017-05-05 20:47:11.000000000 +0200 -+++ xfsprogs-4.11.0/libxfs/Makefile 2017-06-02 14:32:27.354798232 +0200 +--- xfsprogs-4.13.1.orig/libxfs/Makefile 2017-09-09 02:35:35.000000000 +0200 ++++ xfsprogs-4.13.1/libxfs/Makefile 2017-11-25 17:47:45.180739534 +0100 @@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) # don't try linking xfs_repair with a debug libxfs. DEBUG = -DNDEBUG @@ -10,5 +10,5 @@ -default: crc32selftest ltdepend $(LTLIBRARY) +default: ltdepend $(LTLIBRARY) - crc32table.h: gen_crc32table.c + crc32table.h: gen_crc32table.c crc32defs.h @echo " [CC] gen_crc32table" diff --git a/package/xfsprogs/patches/patch-spaceman_Makefile b/package/xfsprogs/patches/patch-spaceman_Makefile new file mode 100644 index 000000000..1bd7da4a7 --- /dev/null +++ b/package/xfsprogs/patches/patch-spaceman_Makefile @@ -0,0 +1,13 @@ +--- xfsprogs-4.13.1.orig/spaceman/Makefile 2017-09-09 02:35:35.000000000 +0200 ++++ xfsprogs-4.13.1/spaceman/Makefile 2017-11-25 17:55:33.271558933 +0100 +@@ -9,8 +9,8 @@ LTCOMMAND = xfs_spaceman + HFILES = init.h space.h + CFILES = init.c file.c prealloc.c trim.c + +-LLDLIBS = $(LIBXCMD) +-LTDEPENDENCIES = $(LIBXCMD) ++LLDLIBS = $(LIBXFS) $(LIBXCMD) ++LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD) + LLDFLAGS = -static + + ifeq ($(ENABLE_READLINE),yes) |