[oe,meta-oe,5/6] nano: Upgrade 2.9.3 -> 2.9.7

Message ID 20180520223517.9869-5-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-gnome,1/6] network-manager-applet: Package gir-1.0 files into devel package
Related show

Commit Message

Khem Raj May 20, 2018, 10:35 p.m.
Fix build with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta-oe/recipes-support/nano/nano_2.9.3.bb | 4 ----
 meta-oe/recipes-support/nano/nano_2.9.7.bb | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 meta-oe/recipes-support/nano/nano_2.9.3.bb
 create mode 100644 meta-oe/recipes-support/nano/nano_2.9.7.bb

-- 
2.17.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/nano/nano_2.9.3.bb b/meta-oe/recipes-support/nano/nano_2.9.3.bb
deleted file mode 100644
index afb0cf2e73..0000000000
--- a/meta-oe/recipes-support/nano/nano_2.9.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@ 
-include nano.inc
-
-SRC_URI[md5sum] = "6dd37f010d6a985bf0e5f8ed091ff919"
-SRC_URI[sha256sum] = "7783bcfd4b2d5dc0bf64d4bd07b1a19e7ba3c91da881a4249772a36b972d4012"
diff --git a/meta-oe/recipes-support/nano/nano_2.9.7.bb b/meta-oe/recipes-support/nano/nano_2.9.7.bb
new file mode 100644
index 0000000000..419e5406ba
--- /dev/null
+++ b/meta-oe/recipes-support/nano/nano_2.9.7.bb
@@ -0,0 +1,8 @@ 
+include nano.inc
+
+do_install_append_libc-musl () {
+	rm -rf ${D}${libdir}/charset.alias
+	rmdir ${D}${libdir}
+}
+SRC_URI[md5sum] = "e0c6d76c93932f6c41c40842952495f7"
+SRC_URI[sha256sum] = "b64ab017305b1777e97b5b9b07b31db8aeebfc3e8719f61e8da1cf3866d344bd"