aboutsummaryrefslogtreecommitdiffstats
path: root/package/system/ubus
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2021-07-02 18:00:09 +0200
committerPetr Štetiar <ynezz@true.cz>2021-07-02 18:12:15 +0200
commit8307da3dbdaff13d5ce99f8aefa32f5b7a2e18e6 (patch)
treec18fc159671595990709ae695bb54667d80abef9 /package/system/ubus
parent89ef883b92b3a87d9ab1bd289de26b9e72681dac (diff)
downloadupstream-8307da3dbdaff13d5ce99f8aefa32f5b7a2e18e6.tar.gz
upstream-8307da3dbdaff13d5ce99f8aefa32f5b7a2e18e6.tar.bz2
upstream-8307da3dbdaff13d5ce99f8aefa32f5b7a2e18e6.zip
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@mein.io> Reported-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'package/system/ubus')
-rw-r--r--package/system/ubus/Makefile1
1 files changed, 0 insertions, 1 deletions
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@nbd.name>
-PKG_FLAGS := nonshared
PKG_ASLR_PIE_REGULAR:=1
include $(INCLUDE_DIR)/package.mk