[oe-commits] Paul Eggleton : atftp: move to meta-networking and tweak

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 02023c1543d08bc2d51b739cf846eb49516e1269
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=02023c1543d08bc2d51b739cf846eb49516e1269

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Apr 16 10:54:03 2013 +0000

atftp: move to meta-networking and tweak

* Add origin and Upstream-Status to patches
* Set SUMMARY instead of DESCRIPTION
* Add ${PN}d to PACKAGES instead of atftpd to be consistent with the
  rest of the recipe

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-daemons}/atftp/atftp/atftpd.service    |    0
 .../recipes-daemons}/atftp/atftp_git.bb            |    4 ++--
 ...tpd-0.7_circumvent_tftp_size_restrictions.patch |    5 +++++
 .../atftpd-0.7_unprotected_assignments_crash.patch |    7 +++++++
 .../recipes-daemons}/atftp/files/atftpd.init       |    0
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/atftp/atftp/atftpd.service b/meta-networking/recipes-daemons/atftp/atftp/atftpd.service
similarity index 100%
rename from meta-oe/recipes-extended/atftp/atftp/atftpd.service
rename to meta-networking/recipes-daemons/atftp/atftp/atftpd.service
diff --git a/meta-oe/recipes-extended/atftp/atftp_git.bb b/meta-networking/recipes-daemons/atftp/atftp_git.bb
similarity index 95%
rename from meta-oe/recipes-extended/atftp/atftp_git.bb
rename to meta-networking/recipes-daemons/atftp/atftp_git.bb
index 3e55881..09451bc 100644
--- a/meta-oe/recipes-extended/atftp/atftp_git.bb
+++ b/meta-networking/recipes-daemons/atftp/atftp_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Advanced TFTP server and client"
+SUMMARY = "Advanced TFTP server and client"
 SECTION = "network"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPLv2"
@@ -38,7 +38,7 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
 }
 
-PACKAGES =+ "atftpd"
+PACKAGES =+ "${PN}d"
 
 FILES_${PN} = "${bindir}/*"
 
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
similarity index 98%
rename from meta-oe/recipes-extended/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
rename to meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
index 9aeb351..280b570 100644
--- a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
+++ b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
@@ -8,6 +8,11 @@ hardwared BLOCKSIZE setting of 1432).
 block rollover
 http://www.compuphase.com/tftp.htm
 
+Patch originally from OpenSUSE:
+https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2
+
+Upstream-Status: Pending
+
 Index: git/tftp_def.h
 ===================================================================
 --- git.orig/tftp_def.h	2012-11-19 16:28:50.221027144 -0800
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
similarity index 95%
rename from meta-oe/recipes-extended/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
rename to meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
index 6faf5f9..28fba6c 100644
--- a/meta-oe/recipes-extended/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
+++ b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
@@ -1,3 +1,10 @@
+Avoid assigning thread data outside of mutex lock
+
+Patch originally from OpenSUSE:
+https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2
+
+Upstream-Status: Pending
+
 Index: git/tftpd_list.c
 ===================================================================
 --- git.orig/tftpd_list.c	2012-10-24 21:48:47.000000000 -0700
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd.init b/meta-networking/recipes-daemons/atftp/files/atftpd.init
similarity index 100%
rename from meta-oe/recipes-extended/atftp/files/atftpd.init
rename to meta-networking/recipes-daemons/atftp/files/atftpd.init