aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-01-22 19:17:32 +0100
committerJo-Philipp Wich <jo@mein.io>2019-01-24 10:39:30 +0100
commit0e70f69a35fd79be781c859c12487b626e243e96 (patch)
tree2025021f55f831e09f0f102969e01532881b8147 /package/utils
parent60558790a2a832265ec041131e851b6648f514d4 (diff)
downloadupstream-0e70f69a35fd79be781c859c12487b626e243e96.tar.gz
upstream-0e70f69a35fd79be781c859c12487b626e243e96.tar.bz2
upstream-0e70f69a35fd79be781c859c12487b626e243e96.zip
treewide: revise library packaging
- Annotate versionless libraries (such as libubox, libuci etc.) with a fixed ABI_VERSION resembling the source date of the last incompatible change - Annotate packages shipping versioned library objects with ABI_VERSION - Stop shipping unversioned library symlinks for packages with ABI_VERSION Ref: https://openwrt.org/docs/guide-developer/package-policies#shared_libraries Ref: https://github.com/KanjiMonster/maintainer-tools/blob/master/check-abi-versions.pl Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/utils')
-rw-r--r--package/utils/bzip2/Makefile3
-rw-r--r--package/utils/e2fsprogs/Makefile9
-rw-r--r--package/utils/f2fs-tools/Makefile5
-rw-r--r--package/utils/fuse/Makefile3
-rw-r--r--package/utils/lua/Makefile3
-rw-r--r--package/utils/util-linux/Makefile22
6 files changed, 26 insertions, 19 deletions
diff --git a/package/utils/bzip2/Makefile b/package/utils/bzip2/Makefile
index d26e215757..9c64d2264a 100644
--- a/package/utils/bzip2/Makefile
+++ b/package/utils/bzip2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bzip2
PKG_VERSION:=1.0.6
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://distfiles.gentoo.org/distfiles/ \
@@ -35,6 +35,7 @@ $(call Package/bzip2/Default)
CATEGORY:=Libraries
DEPENDS:=
TITLE:=bzip2 library.
+ ABI_VERSION:=1.0
endef
define Package/libbz2/description
diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 48f812a30c..a40e7bd3a7 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
PKG_VERSION:=1.44.3
PKG_HASH:=5d899f7d30f481cc0c6a049ebe26ebe145f1b524182ea1ecde4086162d4e4bb6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
@@ -45,6 +45,7 @@ define Package/libext2fs
TITLE:=ext2/3/4 filesystem library
URL:=http://e2fsprogs.sourceforge.net/
DEPENDS:=+libuuid +libblkid +libss +libcomerr
+ ABI_VERSION:=2
endef
define Package/libext2fs/description
@@ -57,6 +58,7 @@ define Package/libss
TITLE:=command-line interface parsing library
URL:=http://e2fsprogs.sourceforge.net/
DEPENDS:=+libcomerr
+ ABI_VERSION:=2
endef
define Package/libss/description
@@ -70,6 +72,7 @@ define Package/libcomerr
TITLE:=common error description library
URL:=http://e2fsprogs.sourceforge.net/
DEPENDS:=+libuuid
+ ABI_VERSION:=0
endef
define Package/libcomerr/description
@@ -234,12 +237,12 @@ endef
define Package/libcomerr/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* $(1)/usr/lib/
endef
define Package/libss/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libss.so* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libss.so.* $(1)/usr/lib/
endef
define Package/libext2fs/install
diff --git a/package/utils/f2fs-tools/Makefile b/package/utils/f2fs-tools/Makefile
index b782b80670..8a264c5111 100644
--- a/package/utils/f2fs-tools/Makefile
+++ b/package/utils/f2fs-tools/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=f2fs-tools
PKG_VERSION:=1.12.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_LICENSE:=GPLv2
@@ -54,6 +54,7 @@ define Package/libf2fs
CATEGORY:=Libraries
TITLE:=Library for Flash-Friendly File System (F2FS) tools
DEPENDS:=+libuuid
+ ABI_VERSION:=6
endef
CONFIGURE_ARGS += \
@@ -66,7 +67,7 @@ CONFIGURE_VARS += \
define Package/libf2fs/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/libf2fs.so* $(1)/usr/lib/
+ $(PKG_INSTALL_DIR)/usr/lib/libf2fs.so.* $(1)/usr/lib/
endef
define Package/mkf2fs/install
diff --git a/package/utils/fuse/Makefile b/package/utils/fuse/Makefile
index e853a8e041..be80b03c42 100644
--- a/package/utils/fuse/Makefile
+++ b/package/utils/fuse/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fuse
PKG_VERSION:=2.9.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/libfuse/libfuse/releases/download/$(PKG_NAME)-$(PKG_VERSION)
@@ -56,6 +56,7 @@ $(call Package/fuse/Default)
TITLE+= (library)
DEPENDS:=+kmod-fuse +libpthread
SUBMENU:=Filesystem
+ ABI_VERSION:=1
endef
define Package/libfuse/description
diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
index 97c18def66..c34e569b67 100644
--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lua
PKG_VERSION:=5.1.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
@@ -46,6 +46,7 @@ $(call Package/lua/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE+= (libraries)
+ ABI_VERSION:=5.1.5
endef
define Package/liblua/description
diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 5e1a6ea58a..169ef5159c 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
PKG_VERSION:=2.33
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.33
@@ -47,6 +47,7 @@ $(call Package/util-linux/Default)
TITLE:=block device id library
SECTION:=libs
CATEGORY:=Libraries
+ ABI_VERSION:=1
endef
define Package/libblkid/description
@@ -62,6 +63,7 @@ $(call Package/util-linux/Default)
TITLE:=partition manipulating library
SECTION:=libs
CATEGORY:=Libraries
+ ABI_VERSION:=1
endef
define Package/libfdisk/description
@@ -74,6 +76,7 @@ $(call Package/util-linux/Default)
TITLE:=mount library
SECTION:=libs
CATEGORY:=Libraries
+ ABI_VERSION:=1
endef
define Package/libmount/description
@@ -86,6 +89,7 @@ $(call Package/util-linux/Default)
TITLE:=DCE compatible Universally Unique Identifier library
SECTION:=libs
CATEGORY:=Libraries
+ ABI_VERSION:=1
endef
define Package/libuuid/description
@@ -100,6 +104,7 @@ $(call Package/util-linux/Default)
TITLE:=table or tree library
SECTION:=libs
CATEGORY:=Libraries
+ ABI_VERSION:=1
endef
define Package/libsmartcols/description
@@ -544,32 +549,27 @@ endef
define Package/libfdisk/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib/
- $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so
+ $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so.* $(1)/usr/lib/
endef
define Package/libblkid/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib/
- $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so
+ $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so.* $(1)/usr/lib/
endef
define Package/libmount/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib/
- $(LN) libmount.so.1 $(1)/usr/lib/libmount.so
+ $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so.* $(1)/usr/lib/
endef
define Package/libsmartcols/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib/
- $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so
+ $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so.* $(1)/usr/lib/
endef
define Package/libuuid/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib/
- $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so
+ $(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so.* $(1)/usr/lib/
endef
define Package/agetty/install