diff options
Diffstat (limited to 'meta-networking/recipes-daemons/atftp')
-rw-r--r-- | meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch | 45 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch | 43 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/atftp/atftp/atftpd.init (renamed from meta-networking/recipes-daemons/atftp/files/atftpd.init) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb | 59 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb | 56 |
5 files changed, 56 insertions, 147 deletions
diff --git a/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch b/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch deleted file mode 100644 index cfa8a7325f..0000000000 --- a/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:41:57 +0200 -Subject: [PATCH] argz.h: fix musl compile (add missing defines) - -Upstream-Status: Pending - -Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - argz.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/argz.h b/argz.h -index 582be55..bdf9f62 100644 ---- a/argz.h -+++ b/argz.h -@@ -48,6 +48,22 @@ - # define __const const - #endif - -+#ifndef __THROW -+# define __THROW -+#endif -+ -+#ifndef __BEGIN_DECLS -+# define __BEGIN_DECLS -+#endif -+ -+#ifndef __END_DECLS -+# define __END_DECLS -+#endif -+ -+#ifndef __attribute_pure__ -+# define __attribute_pure__ -+#endif -+ - #ifndef __error_t_defined - typedef int error_t; - #endif --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch deleted file mode 100644 index 093054ce80..0000000000 --- a/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:43:49 +0200 -Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include) - -Upstream-Status: Pending - -Add sys/types.h include for u_char typedef. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - tftp.h | 1 + - tftpd.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tftp.h b/tftp.h -index 12bd6aa..32a3f63 100644 ---- a/tftp.h -+++ b/tftp.h -@@ -19,6 +19,7 @@ - - #include <sys/time.h> - #include <sys/times.h> -+#include <sys/types.h> - #include "tftp_def.h" - #include "config.h" - -diff --git a/tftpd.h b/tftpd.h -index 945065e..60d3a49 100644 ---- a/tftpd.h -+++ b/tftpd.h -@@ -20,6 +20,7 @@ - #include <pthread.h> - #include <arpa/tftp.h> - #include <arpa/inet.h> -+#include <sys/types.h> - #include "tftp_io.h" - - /* --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/atftp/files/atftpd.init b/meta-networking/recipes-daemons/atftp/atftp/atftpd.init index 161d97aca7..161d97aca7 100644 --- a/meta-networking/recipes-daemons/atftp/files/atftpd.init +++ b/meta-networking/recipes-daemons/atftp/atftp/atftpd.init diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb b/meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb deleted file mode 100644 index ff9084dbf6..0000000000 --- a/meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "Advanced TFTP server and client" -SECTION = "net" -HOMEPAGE = "http://packages.debian.org/atftp" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRCREV = "52b71f0831dcbde508bd3a961d84abb80a62480f" - -SRC_URI = "git://git.code.sf.net/p/atftp/code \ - file://atftpd.init \ - file://atftpd.service \ -" -SRC_URI_append_libc-musl = " file://0001-argz.h-fix-musl-compile-add-missing-defines.patch \ - file://0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools update-rc.d systemd - -PACKAGECONFIG ??= "tcp-wrappers" -PACKAGECONFIG[pcre] = "--enable-libpcre,--disable-libpcre,libpcre" -PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" -PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline" - -INITSCRIPT_PACKAGES = "${PN}d" -INITSCRIPT_NAME_${PN}d = "atftpd" -INITSCRIPT_PARAMS_${PN}d = "defaults 80" - - -EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd - - install -d ${D}/srv/tftp - - rm ${D}${sbindir}/in.tftpd - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system -} - -PACKAGES =+ "${PN}d" - -FILES_${PN} = "${bindir}/*" - -FILES_${PN}d = "${sbindir}/* \ - ${sysconfdir} \ - /srv/tftp \ - ${systemd_unitdir}/system/atftpd.service \ -" - -SYSTEMD_PACKAGES = "${PN}d" -SYSTEMD_SERVICE_${PN}d = "atftpd.service" -RPROVIDES_${PN}d += "${PN}d-systemd" -RREPLACES_${PN}d += "${PN}d-systemd" -RCONFLICTS_${PN}d += "${PN}d-systemd" diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb new file mode 100644 index 0000000000..41b7cf0878 --- /dev/null +++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb @@ -0,0 +1,56 @@ +SUMMARY = "Advanced TFTP server and client" +SECTION = "net" +HOMEPAGE = "http://packages.debian.org/atftp" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f65159f73e603f89d6867d43191900e5" + +SRCREV = "d5c27eb7a9695d83569767e27ef69674173db39a" + +SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \ + file://atftpd.init \ + file://atftpd.service \ +" + +S = "${WORKDIR}/git" + +inherit autotools update-rc.d systemd + +PACKAGECONFIG ??= "tcp-wrappers" +PACKAGECONFIG[pcre] = "--enable-libpcre,--disable-libpcre,libpcre" +PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline" + +INITSCRIPT_PACKAGES = "${PN}d" +INITSCRIPT_NAME:${PN}d = "atftpd" +INITSCRIPT_PARAMS:${PN}d = "defaults 80" + + +EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" + +do_install:append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd + + install -d ${D}/srv/tftp + + rm ${D}${sbindir}/in.tftpd + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/atftpd.service ${D}${systemd_unitdir}/system +} + +PACKAGES =+ "${PN}d" + +FILES:${PN} = "${bindir}/*" + +FILES:${PN}d = "${sbindir}/* \ + ${sysconfdir} \ + /srv/tftp \ + ${systemd_unitdir}/system/atftpd.service \ +" + +SYSTEMD_PACKAGES = "${PN}d" +SYSTEMD_SERVICE:${PN}d = "atftpd.service" +RPROVIDES:${PN}d += "${PN}d-systemd" +RREPLACES:${PN}d += "${PN}d-systemd" +RCONFLICTS:${PN}d += "${PN}d-systemd" |