From 015e6c8710d73ce26ed5617dea5b17341a48c445 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 26 Apr 2014 13:34:24 -0700
Subject: debianutils: Upgrade to 4.4

License is changed since readlink is dropped
from package which was sole package licensed under BSD

Additionally fix  B != S build too

Below is the diff of license change

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../debianutils/debianutils_2.30.bb                | 60 ----------------------
 .../recipes-support/debianutils/debianutils_4.4.bb | 58 +++++++++++++++++++++
 2 files changed, 58 insertions(+), 60 deletions(-)
 delete mode 100644 meta-oe/recipes-support/debianutils/debianutils_2.30.bb
 create mode 100644 meta-oe/recipes-support/debianutils/debianutils_4.4.bb

diff --git a/meta-oe/recipes-support/debianutils/debianutils_2.30.bb b/meta-oe/recipes-support/debianutils/debianutils_2.30.bb
deleted file mode 100644
index 624cf3c4a8..0000000000
--- a/meta-oe/recipes-support/debianutils/debianutils_2.30.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-SUMMARY = "Miscellaneous utilities specific to Debian"
-SECTION = "base"
-LICENSE = "GPLv2 & BSD & SMAIL_GPL"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=b948675029f79c64840e78881e91e1d4"
-
-PR = "r1"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.gz"
-SRC_URI[md5sum] = "7fdd5f8395162d8728d4b79e97b9819e"
-SRC_URI[sha256sum] = "d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401"
-
-inherit autotools
-
-do_configure_prepend() {
-    sed -i -e 's:tempfile.1 which.1:which.1:g' Makefile.am
-}
-
-do_install_append() {
-    for app in ${D}${sbindir}/* ${D}${bindir}/*; do
-        mv $app $app.${PN}
-    done
-    if [ "${base_bindir}" != "${bindir}" ]; then
-        # Debian places some utils into ${base_bindir} as does busybox
-        install -d ${D}${base_bindir}
-        for app in run-parts.${PN} tempfile.${PN}; do
-            mv ${D}${bindir}/$app ${D}${base_bindir}/$app
-        done
-    fi
-}
-
-pkg_prerm_${PN} () {
-if [ "x$D" != "x" ]; then
-    echo "can't do u-a offline" ; exit 1
-else
-    for app in add-shell  installkernel  mkboot  remove-shell run-parts  savelog  sensible-browser  sensible-editor  sensible-pager  tempfile  which ; do
-       update-alternatives --remove $app $app.${PN}
-    done
-fi
-}
-
-pkg_postinst_${PN} () {
-if [ "x$D" != "x" ]; then
-    echo "can't do u-a offline" ; exit 1
-else
-    for app in add-shell  installkernel  mkboot  remove-shell ; do
-        update-alternatives --install ${sbindir}/$app $app $app.${PN} 100
-    done
-
-    for app in savelog  sensible-browser  sensible-editor  sensible-pager  which ; do
-        update-alternatives --install ${bindir}/$app $app $app.${PN} 100
-    done
-
-    for app in run-parts  tempfile ; do
-        update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100
-    done
-fi
-}
-
-
-
diff --git a/meta-oe/recipes-support/debianutils/debianutils_4.4.bb b/meta-oe/recipes-support/debianutils/debianutils_4.4.bb
new file mode 100644
index 0000000000..30dd9a6faf
--- /dev/null
+++ b/meta-oe/recipes-support/debianutils/debianutils_4.4.bb
@@ -0,0 +1,58 @@
+SUMMARY = "Miscellaneous utilities specific to Debian"
+SECTION = "base"
+LICENSE = "GPLv2 & SMAIL_GPL"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.gz"
+SRC_URI[md5sum] = "c0cb076754d7f4eb1e3397d00916647f"
+SRC_URI[sha256sum] = "190850cdd6b5302e0a1ba1aaed1bc7074d67d3bd8d04c613f242f7145afa53a6"
+
+inherit autotools
+
+do_configure_prepend() {
+    sed -i -e 's:tempfile.1 which.1:which.1:g' ${S}/Makefile.am
+}
+
+do_install_append() {
+    for app in ${D}${sbindir}/* ${D}${bindir}/*; do
+        mv $app $app.${PN}
+    done
+    if [ "${base_bindir}" != "${bindir}" ]; then
+        # Debian places some utils into ${base_bindir} as does busybox
+        install -d ${D}${base_bindir}
+        for app in run-parts.${PN} tempfile.${PN}; do
+            mv ${D}${bindir}/$app ${D}${base_bindir}/$app
+        done
+    fi
+}
+
+pkg_prerm_${PN} () {
+if [ "x$D" != "x" ]; then
+    echo "can't do u-a offline" ; exit 1
+else
+    for app in add-shell  installkernel  mkboot  remove-shell run-parts  savelog  sensible-browser  sensible-editor  sensible-pager  tempfile  which ; do
+       update-alternatives --remove $app $app.${PN}
+    done
+fi
+}
+
+pkg_postinst_${PN} () {
+if [ "x$D" != "x" ]; then
+    echo "can't do u-a offline" ; exit 1
+else
+    for app in add-shell  installkernel  mkboot  remove-shell ; do
+        update-alternatives --install ${sbindir}/$app $app $app.${PN} 100
+    done
+
+    for app in savelog  sensible-browser  sensible-editor  sensible-pager  which ; do
+        update-alternatives --install ${bindir}/$app $app $app.${PN} 100
+    done
+
+    for app in run-parts  tempfile ; do
+        update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100
+    done
+fi
+}
+
+
+
-- 
cgit 1.2.3-korg