Merge commit 'openembedded.org/org.openembedded.dev' into org.openembedded.dev

7 files changed, 17 insertions, 9 deletions

diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc
index 6400e80b11..e438423c9c 100644
--- a/packages/gnutls/gnutls.inc
+++ b/packages/gnutls/gnutls.inc
@@ -9,11 +9,6 @@ inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--with-included-opencdk --with-included-libtasn1"
 
-# fix wrong dependency
-do_configure_prepend() {
-    sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in
-}
-
 do_stage() {
     oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
     oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
diff --git a/packages/gnutls/gnutls_1.4.5.bb b/packages/gnutls/gnutls_1.4.5.bb
index 749064af65..a5e58735a0 100644
--- a/packages/gnutls/gnutls_1.4.5.bb
+++ b/packages/gnutls/gnutls_1.4.5.bb
@@ -1,3 +1,8 @@
 require gnutls.inc
 
+# fix wrong dependency
+do_configure_prepend() {
+    sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in
+}
+
 PR = "r3"
diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb
index ce10a4b6cf..7a89835237 100644
--- a/packages/gnutls/gnutls_1.6.3.bb
+++ b/packages/gnutls/gnutls_1.6.3.bb
@@ -6,4 +6,9 @@ SRC_URI += "\
 	file://configure_madness.patch;patch=1 \
 	"
 
+# fix wrong dependency
+do_configure_prepend() {
+    sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in
+}
+
 PR = "r6"
diff --git a/packages/gnutls/gnutls_2.4.2.bb b/packages/gnutls/gnutls_2.4.2.bb
index 3313a456a1..15614fbe5a 100644
--- a/packages/gnutls/gnutls_2.4.2.bb
+++ b/packages/gnutls/gnutls_2.4.2.bb
@@ -5,3 +5,5 @@ SRC_URI += "\
 	file://gnutls-texinfo-euro.patch;patch=1 \
 	file://configure_madness.patch;patch=1 \
 	"
+
+PR = "r1"
diff --git a/packages/linux/linux-bd-neon-2.6_2.6.22.bb b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
index 05ceb28ee5..400fe782db 100644
--- a/packages/linux/linux-bd-neon-2.6_2.6.22.bb
+++ b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "2.6 Linux Kernel for Boundary Devices NEON Board"
 SECTION = "kernel"
 HOMEPAGE = "N/A"
 LICENSE = "GPL"
+COMPATIBLE_MACHINE = "bd-neon"
 DEPENDS += "u-boot-utils-native"
 
 PR = "r2"
diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index 6861d8ad44..51a4a2b32d 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Enables PPP dial-in through a serial connection"
 DEPENDS = "ppp"
 RDEPENDS = "ppp"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 
 SRC_URI = "file://host-peer \
@@ -22,7 +22,7 @@ pkg_postinst() {
 if test "x$D" != "x"; then
 	exit 1
 else
-	adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp
+    grep "^ppp:" /etc/passwd > /dev/null || adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp 
 fi
 }
 
@@ -30,6 +30,6 @@ pkg_postrm() {
 if test "x$D" != "x"; then
 	exit 1
 else
-	deluser ppp
+	deluser ppp || true
 fi
 }
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 57a711577c..9d3bc8ebdd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r73"
+PR = "r74"
 
 inherit task