Procházet zdrojové kódy

mtd-utils: Use include dir that upstream suggests

This prepares to move mtd headers in /usr/include instead of the mtd/
namespace used by kernel. This will be synchronized with future dev
packages for mtd-utils that will be merged into Linux distros (Debian).
For a while, the OE recipe will still contain links to the old path to
be compatible with previous SWUpdate release. The links should be
dropped in future.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Bastian Germann <bage@linutronix.de>
Reviewed-by: Bastian Germann <bage@linutronix.de>
Stefano Babic před 5 roky
rodič
revize
ece400ed52
1 změnil soubory, kde provedl 10 přidání a 5 odebrání
  1. 10 5
      recipes-devtools/mtd/mtd-utils_%.bbappend

+ 10 - 5
recipes-devtools/mtd/mtd-utils_%.bbappend

@@ -1,13 +1,18 @@
 FILES_${PN}-staticdev += "ubi-utils/libubi.a ${libdir}/*.a"
 
+SRCREV = "639b871fe3d2cb3e73d21363e8c13ede2bbd9f99"
+
 do_install_append () {
 	install -d ${D}${includedir}/mtd/
 	install -d ${D}${libdir}/
-	install -m 0644 ${S}/include/libubi.h ${D}${includedir}/mtd/
-	install -m 0644 ${S}/include/libmtd.h ${D}${includedir}/mtd/
-	install -m 0644 ${S}/include/mtd/ubi-media.h ${D}${includedir}/mtd/
-	#oe_libinstall -a -C ubi-utils libubi ${D}${libdir}/
-	#oe_libinstall -a -C lib libmtd ${D}${libdir}/
+	install -m 0644 ${S}/include/libubi.h ${D}${includedir}
+	install -m 0644 ${S}/include/libmtd.h ${D}${includedir}
+	install -m 0644 ${S}/include/libscan.h ${D}${includedir}
+	install -m 0644 ${S}/include/libubigen.h ${D}${includedir}
+	ln -s ../libubi.h ${D}${includedir}/mtd/libubi.h
+	ln -s ../libmtd.h ${D}${includedir}/mtd/libmtd.h
+	ln -s ../libscan.h ${D}${includedir}/mtd/libscan.h
+	ln -s ../libubigen.h ${D}${includedir}/mtd/libubigen.h
 	oe_libinstall -a libubi ${D}${libdir}/
 	oe_libinstall -a libmtd ${D}${libdir}/
 }