treewide: avoid deref symlinks when installing .so
authorJosef Schlehofer <redacted>
Mon, 29 Dec 2025 23:23:18 +0000 (00:23 +0100)
committerJosef Schlehofer <redacted>
Mon, 27 Apr 2026 09:48:13 +0000 (11:48 +0200)
Deduplicate files

Signed-off-by: Josef Schlehofer <redacted>
libs/gost_engine/Makefile
libs/libjwt/Makefile
libs/libmariadb/Makefile
libs/libre2/Makefile
libs/libyaml-cpp/Makefile
libs/oniguruma/Makefile
libs/tinycdb/Makefile
utils/apparmor/Makefile
utils/dbus/Makefile

index e6a806672239850fd1a4d730f9472e76dfaeb031..d70b1057fa987a1bd7486564ad42811baa81fbba 100644 (file)
@@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/openssl-module.mk
 
 PKG_NAME:=gost_engine
 PKG_VERSION:=3.0.3
-PKG_RELEASE:=11
+PKG_RELEASE:=12
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
@@ -61,9 +61,9 @@ CMAKE_OPTIONS += -DOPENSSL_ENGINES_DIR=/usr/lib/$(ENGINES_DIR)
 
 define Package/libopenssl-gost_engine/install
        $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/$(ENGINES_DIR) $(1)/etc/ssl/modules.cnf.d
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libgost.so \
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgost.so \
                        $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/$(ENGINES_DIR)/gost.so \
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(ENGINES_DIR)/gost.so \
                        $(1)/usr/lib/$(ENGINES_DIR)/
        $(INSTALL_DATA) ./files/gost.cnf $(1)/etc/ssl/modules.cnf.d/
 endef
index a3cfa8ab91741766c8ae94b987f57aa23035cd26..06ddbd16d014028477f2d0d6dbb8cdda8ed4edb6 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libjwt
 PKG_VERSION:=1.17.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/benmcollins/libjwt/tar.gz/v$(PKG_VERSION)?
@@ -36,7 +36,7 @@ endef
 
 define Package/libjwt/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjwt.so $(1)/usr/lib/libjwt.so.0
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjwt.so* $(1)/usr/lib/
        $(LN) libjwt.so.0 $(1)/usr/lib/libjwt.so
 endef
 
index c1ac1e7e510c39a105a27319bbf8317abc35813e..43183d3c175cc1e3deb462de3b1c348b40ed6b43 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmariadb
 PKG_VERSION:=3.4.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=\
@@ -146,7 +146,7 @@ define Package/$(PKG_NAME)/install
                $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/mysql_clear_password.so \
                $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/sha256_password.so \
                $(1)$(MARIADB_PLUGIN_DIR)
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libmariadb.so.$(ABI_VERSION) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmariadb.so.$(ABI_VERSION) $(1)/usr/lib
 endef
 
 define BuildPlugin
index 75a0ff1593b0800222afad62a7f6c3d5242eafe0..4a22d9adf02a6b04f8edeb37f7b5ee3257e01231 100644 (file)
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=re2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/google/re2
@@ -47,7 +47,7 @@ endef
 
 define Package/re2/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libre2.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre2.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,re2))
index 991e1451b0537c8c9b3bd248b78f5f1238faffd3..6811b7472157ae15441d4e7654d5f3bd9ba10a86 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libyaml-cpp
 PKG_VERSION:=0.8.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/jbeder/yaml-cpp
@@ -52,7 +52,7 @@ endef
 
 define Package/libyaml-cpp/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml-cpp.so.$(ABI_VERSION) $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyaml-cpp.so.$(ABI_VERSION) $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libyaml-cpp))
index 2a94cf4e27d7b515fd377fc207898cc08c582899..7991d98efec69d5e842218958e6906b272c3752d 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oniguruma
 PKG_VERSION:=6.9.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=onig-v$(subst _,-,$(PKG_VERSION)).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/kkos/oniguruma/tar.gz/v$(PKG_VERSION)?
@@ -43,7 +43,7 @@ CONFIGURE_ARGS += --enable-posix-api
 
 define Package/oniguruma/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libonig.so.$(ABI_VERSION) $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libonig.so.$(ABI_VERSION) $(1)/usr/lib/
 endef
 
 define Build/InstallDev
index 05d56ca041428ac8e400a4558f1ff9c5719e517b..57a0bc5bf1d2f33a8c8cc12c2ac17da7e2ef0319 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinycdb
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE_URL:=http://www.corpit.ru/mjt/tinycdb/
 PKG_VERSION:=0.78
 PKG_HASH:=50678f432d8ada8d69f728ec11c3140e151813a7847cf30a62d86f3a720ed63c
@@ -45,7 +45,7 @@ endef
 
 define Package/tinycdb/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcdb.so.$(ABI_VERSION) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcdb.so.$(ABI_VERSION) $(1)/usr/lib
 endef
 
 define Build/Compile
index b27c115683af9a278aaf9963069f7682bcb66b97..b1f468ba344d4a75a8d1105a2951a91bec98a148 100644 (file)
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apparmor
 PKG_VERSION:=3.0.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
@@ -157,7 +157,7 @@ endef
 
 define Package/libapparmor/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/libapparmor.so.1 $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/libapparmor.so.1 $(1)/usr/lib/
        $(LN) libapparmor.so.1 $(1)/usr/lib/libapparmor.so
 endef
 
@@ -169,7 +169,7 @@ define Package/python3-apparmor/install
                $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/*.py \
                $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/*.so \
+       $(CP) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/*.so \
                $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info/* \
                $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info/
index e29b59673df6e18713681c2c3fce8574a5bdddad..029260d7bf7fbfef7799e04fba1bf1ca36614d3e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dbus
 PKG_VERSION:=1.16.2
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus
@@ -121,7 +121,7 @@ define Build/InstallDev
                $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0/include/dbus/*.h \
                $(1)/usr/lib/dbus-1.0/include/dbus/
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so* \
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so* \
                $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
git clone https://git.99rst.org/PROJECT