[openwrt/openwrt] treewide: unmark selected packages nonshared

LEDE Commits lede-commits at lists.infradead.org
Fri Jul 2 09:12:32 PDT 2021


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8307da3dbdaff13d5ce99f8aefa32f5b7a2e18e6

commit 8307da3dbdaff13d5ce99f8aefa32f5b7a2e18e6
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Fri Jul 2 18:00:09 2021 +0200

    treewide: unmark selected packages nonshared
    
    This partially reverts changes done in commit 72cc44958ef4 ("treewide:
    mark selected packages nonshared") as it removes the nonshared flag, but
    keeps the PKG_RELEASE as the PKG_RELEASE bump while adding nonshared
    flag was incorrect.
    
    Unmark uci, ubus, libubox, lua, libnl-tiny and libjson-c as nonshared
    packages as this fix attempt didn't worked out. Currently the
    imagebuilder is broken again:
    
     openwrt-imagebuilder-21.02.0-rc3-ipq40xx-generic.Linux-x86_64$ make image PROFILE=avm_fritzbox-7530 PACKAGES=luci-ssl-openssl
     ...
     Collected errors:
      * pkg_hash_check_unresolved: cannot find dependency libiwinfo20210430 for luci-mod-status
      * pkg_hash_fetch_best_installation_candidate: Packages for luci-mod-status found, but incompatible with the architectures configured
      * pkg_hash_check_unresolved: cannot find dependency libiwinfo20210430 for rpcd-mod-iwinfo
      * pkg_hash_fetch_best_installation_candidate: Packages for rpcd-mod-iwinfo found, but incompatible with the architectures configured
      * satisfy_dependencies_for: Cannot satisfy the following dependencies for luci-ssl-openssl:
      *     libiwinfo20210430
      * opkg_install_cmd: Cannot install package luci-ssl-openssl.
    
    Everything because iwinfo's ABI was changed two times since rc3 release:
    
     +IWINFO_ABI_VERSION:=20210430
     +IWINFO_ABI_VERSION:=20210420
    
    Since iwinfo is marked as nonshared, it wasn't built by phase2 builders, but
    luci-mod-status was already updated 2 times since rc3 and was thus rebuilt by
    phase2 builders:
    
     d1d452ed2fb3 luci-mod-status: don't set '-' hostname when creating static lease
     95b3633055c1 luci-mod-status: switch to html table for wlan channel analysis
    
    So now luci-mod-status depends on libiwinfo20210430 but only
    libiwinfo20210106 can be downloaded. This is first part of the fix, in
    the upcoming commit Jo is going to remove nonshared flag from iwinfo
    package as well.
    
    References: https://lists.infradead.org/pipermail/openwrt-devel/2021-July/035736.html
    References: https://lists.infradead.org/pipermail/openwrt-devel/2021-July/035741.html
    Acked-by: Jo-Philipp Wich <jo at mein.io>
    Reported-by: Nick Hainke <vincent at systemli.org>
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 package/libs/libjson-c/Makefile  | 1 -
 package/libs/libnl-tiny/Makefile | 2 --
 package/libs/libubox/Makefile    | 2 --
 package/system/ubus/Makefile     | 1 -
 package/system/uci/Makefile      | 2 --
 package/utils/lua/Makefile       | 1 -
 6 files changed, 9 deletions(-)

diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile
index d4a16f36cb..63cc214438 100644
--- a/package/libs/libjson-c/Makefile
+++ b/package/libs/libjson-c/Makefile
@@ -20,7 +20,6 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:json-c_project:json-c
 
-PKG_FLAGS := nonshared
 HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/libs/libnl-tiny/Makefile b/package/libs/libnl-tiny/Makefile
index ff3da5b518..bdb496c48e 100644
--- a/package/libs/libnl-tiny/Makefile
+++ b/package/libs/libnl-tiny/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_VERSION:=c291088f631d1694f7ba0444b59677b194348da8
 PKG_MIRROR_HASH:=99bcce12701bb34dadb39689d95c2c5cf1e27719d0ecfd645d3957a8947025ac
 CMAKE_INSTALL:=1
 
-PKG_FLAGS := nonshared
-
 PKG_LICENSE:=LGPL-2.1
 PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 
diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index cc5d7f7ae6..42a3f4ac3c 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -11,8 +11,6 @@ PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1
 
-PKG_FLAGS := nonshared
-
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index 678ebb1b9e..e39de3c5dc 100644
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -15,7 +15,6 @@ PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 
-PKG_FLAGS := nonshared
 PKG_ASLR_PIE_REGULAR:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile
index 1355955d1a..0c18033e06 100644
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -22,8 +22,6 @@ PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 
-PKG_FLAGS := nonshared
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
index 83b83e4856..d262d1e1fc 100644
--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
 	http://www.tecgraf.puc-rio.br/lua/ftp/
 PKG_HASH:=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
 PKG_BUILD_PARALLEL:=1
-PKG_FLAGS := nonshared
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYRIGHT



More information about the lede-commits mailing list