[openwrt/openwrt] util-linux: move libuuid BuildPackage line further up to fix ABI versioning

LEDE Commits lede-commits at lists.infradead.org
Mon Feb 15 18:00:18 EST 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/46b6ee7ffc457af8aad1a0f7e5936f50041141d8

commit 46b6ee7ffc457af8aad1a0f7e5936f50041141d8
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Feb 15 23:59:18 2021 +0100

    util-linux: move libuuid BuildPackage line further up to fix ABI versioning
    
    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 at nbd.name>
---
 package/utils/util-linux/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index f4b870cc47..b385030e39 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -791,11 +791,13 @@ define Package/wipefs/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/wipefs $(1)/usr/sbin/
 endef
 
+# these lines need to be ordered by dependency because of ABI versioning
+$(eval $(call BuildPackage,libuuid))
 $(eval $(call BuildPackage,libblkid))
 $(eval $(call BuildPackage,libfdisk))
+
 $(eval $(call BuildPackage,libmount))
 $(eval $(call BuildPackage,libsmartcols))
-$(eval $(call BuildPackage,libuuid))
 $(eval $(call BuildPackage,agetty))
 $(eval $(call BuildPackage,blkdiscard))
 $(eval $(call BuildPackage,blkid))



More information about the lede-commits mailing list