From 537c2a631dd117564720a80f6976280901b010f5 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 30 Dec 2025 00:23:18 +0100 Subject: [PATCH] treewide: avoid deref symlinks when installing .so Deduplicate files Signed-off-by: Josef Schlehofer --- libs/gost_engine/Makefile | 6 +++--- libs/libjwt/Makefile | 4 ++-- libs/libmariadb/Makefile | 4 ++-- libs/libre2/Makefile | 4 ++-- libs/libyaml-cpp/Makefile | 4 ++-- libs/oniguruma/Makefile | 4 ++-- libs/tinycdb/Makefile | 4 ++-- utils/apparmor/Makefile | 6 +++--- utils/dbus/Makefile | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libs/gost_engine/Makefile b/libs/gost_engine/Makefile index e6a8066722..d70b1057fa 100644 --- a/libs/gost_engine/Makefile +++ b/libs/gost_engine/Makefile @@ -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 diff --git a/libs/libjwt/Makefile b/libs/libjwt/Makefile index a3cfa8ab91..06ddbd16d0 100644 --- a/libs/libjwt/Makefile +++ b/libs/libjwt/Makefile @@ -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 diff --git a/libs/libmariadb/Makefile b/libs/libmariadb/Makefile index c1ac1e7e51..43183d3c17 100644 --- a/libs/libmariadb/Makefile +++ b/libs/libmariadb/Makefile @@ -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 diff --git a/libs/libre2/Makefile b/libs/libre2/Makefile index 75a0ff1593..4a22d9adf0 100644 --- a/libs/libre2/Makefile +++ b/libs/libre2/Makefile @@ -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)) diff --git a/libs/libyaml-cpp/Makefile b/libs/libyaml-cpp/Makefile index 991e1451b0..6811b74721 100644 --- a/libs/libyaml-cpp/Makefile +++ b/libs/libyaml-cpp/Makefile @@ -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)) diff --git a/libs/oniguruma/Makefile b/libs/oniguruma/Makefile index 2a94cf4e27..7991d98efe 100644 --- a/libs/oniguruma/Makefile +++ b/libs/oniguruma/Makefile @@ -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 diff --git a/libs/tinycdb/Makefile b/libs/tinycdb/Makefile index 05d56ca041..57a0bc5bf1 100644 --- a/libs/tinycdb/Makefile +++ b/libs/tinycdb/Makefile @@ -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 diff --git a/utils/apparmor/Makefile b/utils/apparmor/Makefile index b27c115683..b1f468ba34 100644 --- a/utils/apparmor/Makefile +++ b/utils/apparmor/Makefile @@ -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/ diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index e29b59673d..029260d7bf 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -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