EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: reorder more BuildPackages lines to deal with ABI_VERSION

Browse Source 
After the ABI version rework, packages need to be declared in the order of
their dependencies, so that dependent packages will use the right ABI version

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2021-02-16 00:03:28 +01:00
parent a5c4c40476
commit d02088762a
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/libs/elfutils/Makefile
View File

@ -95,7 +95,8 @@ define Package/libelf/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf{-*.so,*.so.*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf{-*.so,*.so.*} $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libasm)) # these lines need to be ordered by dependency because of ABI versioning
$(eval $(call BuildPackage,libdw))
$(eval $(call BuildPackage,libelf)) $(eval $(call BuildPackage,libelf))
$(eval $(call BuildPackage,libdw))
$(eval $(call BuildPackage,libasm))
$(eval $(call HostBuild)) $(eval $(call HostBuild))

2
package/network/utils/bpftools/Makefile
View File

@ -162,6 +162,6 @@ define Package/libbpf/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libbpf.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libbpf.so.* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libbpf))
$(eval $(call BuildPackage,bpftool-full)) $(eval $(call BuildPackage,bpftool-full))
$(eval $(call BuildPackage,bpftool-minimal)) $(eval $(call BuildPackage,bpftool-minimal))
$(eval $(call BuildPackage,libbpf))

2
package/network/utils/ipset/Makefile
View File

@ -69,5 +69,5 @@ define Package/libipset/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so.* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,ipset))
$(eval $(call BuildPackage,libipset)) $(eval $(call BuildPackage,libipset))
$(eval $(call BuildPackage,ipset))

9
package/network/utils/iptables/Makefile
View File

@ -657,6 +657,10 @@ define BuildPlugin
$$(eval $$(call BuildPackage,$(1))) $$(eval $$(call BuildPackage,$(1)))
endef endef
$(eval $(call BuildPackage,libxtables))
$(eval $(call BuildPackage,libxtables-nft))
$(eval $(call BuildPackage,libip4tc))
$(eval $(call BuildPackage,libip6tc))
$(eval $(call BuildPackage,iptables)) $(eval $(call BuildPackage,iptables))
$(eval $(call BuildPackage,iptables-nft)) $(eval $(call BuildPackage,iptables-nft))
$(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m)))
@ -685,7 +689,4 @@ $(eval $(call BuildPackage,ip6tables))
$(eval $(call BuildPackage,ip6tables-nft)) $(eval $(call BuildPackage,ip6tables-nft))
$(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m))) $(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m)))
$(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m))) $(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m)))
$(eval $(call BuildPackage,libip4tc))
$(eval $(call BuildPackage,libip6tc))
$(eval $(call BuildPackage,libxtables))
$(eval $(call BuildPackage,libxtables-nft))

2
package/network/utils/wireless-tools/Makefile
View File

@ -89,5 +89,5 @@ define Package/libiw/install
$(CP) $(PKG_BUILD_DIR)/libiw.so.* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libiw.so.* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,wireless-tools))
$(eval $(call BuildPackage,libiw)) $(eval $(call BuildPackage,libiw))
$(eval $(call BuildPackage,wireless-tools))

2
package/system/uci/Makefile
View File

@ -84,6 +84,6 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
endef endef
$(eval $(call BuildPackage,uci))
$(eval $(call BuildPackage,libuci)) $(eval $(call BuildPackage,libuci))
$(eval $(call BuildPackage,libuci-lua)) $(eval $(call BuildPackage,libuci-lua))
$(eval $(call BuildPackage,uci))

2
package/utils/e2fsprogs/Makefile
View File

@ -315,10 +315,10 @@ define Package/lsattr/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsattr $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsattr $(1)/usr/bin/
endef endef
$(eval $(call BuildPackage,e2fsprogs))
$(eval $(call BuildPackage,libcomerr)) $(eval $(call BuildPackage,libcomerr))
$(eval $(call BuildPackage,libss)) $(eval $(call BuildPackage,libss))
$(eval $(call BuildPackage,libext2fs)) $(eval $(call BuildPackage,libext2fs))
$(eval $(call BuildPackage,e2fsprogs))
$(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,tune2fs))
$(eval $(call BuildPackage,resize2fs)) $(eval $(call BuildPackage,resize2fs))
$(eval $(call BuildPackage,badblocks)) $(eval $(call BuildPackage,badblocks))