mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
8307da3dbd
This partially reverts changes done in commit 72cc44958e ("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>
114 lines
2.8 KiB
Makefile
114 lines
2.8 KiB
Makefile
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=libubox
|
|
PKG_RELEASE=2
|
|
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
|
|
PKG_MIRROR_HASH:=7dd1db1e0074a9c7c722db654cce3111b3bd3cff0bfd791c4497cb0f6c22d3ca
|
|
PKG_SOURCE_DATE:=2021-05-16
|
|
PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e
|
|
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
|
|
CMAKE_INSTALL:=1
|
|
|
|
PKG_LICENSE:=ISC
|
|
PKG_LICENSE_FILES:=
|
|
|
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
|
|
|
PKG_BUILD_DEPENDS:=lua
|
|
HOST_BUILD_DEPENDS:=libjson-c/host
|
|
HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/host-build.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
|
|
define Package/libubox
|
|
SECTION:=libs
|
|
CATEGORY:=Libraries
|
|
TITLE:=Basic utility library
|
|
ABI_VERSION:=$(PKG_ABI_VERSION)
|
|
DEPENDS:=
|
|
endef
|
|
|
|
define Package/libblobmsg-json
|
|
SECTION:=libs
|
|
CATEGORY:=Libraries
|
|
TITLE:=blobmsg <-> json conversion library
|
|
ABI_VERSION:=$(PKG_ABI_VERSION)
|
|
DEPENDS:=+libjson-c +libubox
|
|
endef
|
|
|
|
define Package/jshn
|
|
SECTION:=utils
|
|
CATEGORY:=Utilities
|
|
DEPENDS:=+libjson-c +libubox +libblobmsg-json
|
|
TITLE:=JSON SHell Notation
|
|
endef
|
|
|
|
define Package/jshn/description
|
|
Library for parsing and generating JSON from shell scripts
|
|
endef
|
|
|
|
define Package/libjson-script
|
|
SECTION:=utils
|
|
CATEGORY:=Utilities
|
|
DEPENDS:=+libubox
|
|
ABI_VERSION:=$(PKG_ABI_VERSION)
|
|
TITLE:=Minimalistic JSON based scripting engine
|
|
endef
|
|
|
|
define Package/libubox-lua
|
|
SECTION:=libs
|
|
CATEGORY:=Libraries
|
|
DEPENDS:=+libubox +liblua
|
|
TITLE:=Lua binding for the OpenWrt Basic utility library
|
|
endef
|
|
|
|
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
|
|
CMAKE_OPTIONS += \
|
|
-DLUAPATH=/usr/lib/lua \
|
|
-DABIVERSION="$(PKG_ABI_VERSION)"
|
|
|
|
define Package/libubox/install
|
|
$(INSTALL_DIR) $(1)/lib/
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so.* $(1)/lib/
|
|
endef
|
|
|
|
define Package/libblobmsg-json/install
|
|
$(INSTALL_DIR) $(1)/lib/
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so.* $(1)/lib/
|
|
endef
|
|
|
|
define Package/jshn/install
|
|
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/libubox
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jshn $(1)/usr/bin
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libubox/jshn.sh $(1)/usr/share/libubox
|
|
endef
|
|
|
|
define Package/libjson-script/install
|
|
$(INSTALL_DIR) $(1)/lib/
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so.* $(1)/lib/
|
|
endef
|
|
|
|
define Package/libubox-lua/install
|
|
$(INSTALL_DIR) $(1)/usr/lib/lua
|
|
$(CP) $(PKG_BUILD_DIR)/lua/uloop.so $(1)/usr/lib/lua/
|
|
endef
|
|
|
|
|
|
CMAKE_HOST_OPTIONS += \
|
|
-DBUILD_LUA=OFF \
|
|
-DBUILD_EXAMPLES=OFF \
|
|
-DCMAKE_SKIP_RPATH=FALSE \
|
|
-DCMAKE_MACOSX_RPATH=1 \
|
|
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
|
|
|
|
$(eval $(call BuildPackage,libubox))
|
|
$(eval $(call BuildPackage,libblobmsg-json))
|
|
$(eval $(call BuildPackage,jshn))
|
|
$(eval $(call BuildPackage,libjson-script))
|
|
$(eval $(call BuildPackage,libubox-lua))
|
|
$(eval $(call HostBuild))
|