Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/libmariadb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=libmariadb
PKG_VERSION:=3.4.8
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz
PKG_SOURCE_URL:=\
Expand Down Expand Up @@ -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)
$(CP) $(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

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libmariadb3: Use generic tests
WARNING: opening /ci/packages.adb: UNTRUSTED signature
libmariadb3: [pass] Binary /usr/lib/libmariadb.so.3 does not contain any hardcoded build paths
libmariadb3: [pass] Binary /usr/lib/libmariadb.so.3 is stripped
libmariadb3: [pass] All linked libraries for /usr/lib/libmariadb.so.3 are present
libmariadb3: [warn] Library /usr/lib/libmariadb.so.3 has the same name as its SONAME 'libmariadb.so.3'. The library file should have a more specific version.

This one is from CI/CD

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you can see from libsqlite3 example doing cp smth.so.$(ABI_VERSION)* might not always work, since the ABI might be a link to a different version. That is, be careful.

endef

define BuildPlugin
Expand Down
4 changes: 2 additions & 2 deletions libs/libyaml-cpp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=libyaml-cpp
PKG_VERSION:=0.8.0
PKG_RELEASE:=3
PKG_RELEASE:=4

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/jbeder/yaml-cpp
Expand Down Expand Up @@ -52,7 +52,7 @@ endef

define Package/libyaml-cpp/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(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))
4 changes: 2 additions & 2 deletions libs/oniguruma/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=oniguruma
PKG_VERSION:=6.9.10
PKG_RELEASE:=3
PKG_RELEASE:=4

PKG_SOURCE:=onig-v$(subst _,-,$(PKG_VERSION)).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/kkos/oniguruma/tar.gz/v$(PKG_VERSION)?
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libs/tinycdb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=tinycdb
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_URL:=https://www.corpit.ru/mjt/tinycdb/
PKG_VERSION:=0.78
PKG_HASH:=50678f432d8ada8d69f728ec11c3140e151813a7847cf30a62d86f3a720ed63c
Expand Down Expand Up @@ -45,7 +45,7 @@ endef

define Package/tinycdb/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(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
Comment on lines 46 to 49

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still CI/CD complains:

tinycdb1: Use generic tests
WARNING: opening /ci/packages.adb: UNTRUSTED signature
tinycdb1: [pass] Binary /usr/lib/libcdb.so.1 does not contain any hardcoded build paths
tinycdb1: [pass] Binary /usr/lib/libcdb.so.1 is stripped
tinycdb1: [pass] All linked libraries for /usr/lib/libcdb.so.1 are present
tinycdb1: [warn] Library /usr/lib/libcdb.so.1 has the same name as its SONAME 'libcdb.so.1'. The library file should have a more specific version.
tinycdb1: [pass] SONAME link for /usr/lib/libcdb.so.1 is correct
tinycdb1: [skip] Version check override
tinycdb1: Generic tests passed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which part is bothering you?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That warning! 🤔 Nothing wrong about the CI/CD, though. :)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, the idea is that a file matching the SONAME is a link to a more specific version. So this one is not bad, but sus 👀

Here's my gold standard:

root@OpenWrt:~# ls -lh /usr/lib/libsqlite3.so.*
lrwxrwxrwx    1 root     root          20 May 11 17:17 /usr/lib/libsqlite3.so.0 -> libsqlite3.so.3.53.0
-rwxr-xr-x    1 root     root     1004.6K May 10 12:59 /usr/lib/libsqlite3.so.3.53.0

root@OpenWrt:~# readelf -d /usr/lib/libsqlite3.so.3.53.0 | grep SONAME
 0x000000000000000e (SONAME)             Library soname: [libsqlite3.so.0]


define Build/Compile
Expand Down
Loading