From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../recipes-support/netcat/netcat-openbsd_1.190.bb | 56 ---------------------- .../recipes-support/netcat/netcat-openbsd_1.195.bb | 56 ++++++++++++++++++++++ 2 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.190.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb (limited to 'meta-openembedded/meta-networking/recipes-support/netcat') diff --git a/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.190.bb b/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.190.bb deleted file mode 100644 index defc05cd1..000000000 --- a/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.190.bb +++ /dev/null @@ -1,56 +0,0 @@ -require netcat.inc -SUMMARY = "OpenBSD Netcat" -HOMEPAGE = "http://ftp.debian.org" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=f39e60ae4ea9fdb559c833be2e59de99" - -DEPENDS += "glib-2.0 libbsd" -do_patch[depends] = "quilt-native:do_populate_sysroot" - -SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/netcat-openbsd/1.190-2/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/netcat-openbsd/1.190-2/netcat-openbsd_${PV}-2.debian.tar.xz;name=netcat-patch;subdir=${BP} \ - file://0001-bundle-own-base64-encode-decode-functions.patch \ - " - -SRC_URI[netcat.md5sum] = "dd32fd1d7903b541ad8709794539b959" -SRC_URI[netcat.sha256sum] = "68ccc448392c05ec51baed0167a72b8c650454f990b895d6e6877d416a38e536" -SRC_URI[netcat-patch.md5sum] = "78058b7af0170654b877b02c37716cdf" -SRC_URI[netcat-patch.sha256sum] = "88088af3f520c7825e59bc133d65e70fc4a30139d451c6faabbd9f240bc78374" - -inherit pkgconfig - -EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" - -do_configure[noexec] = "1" - -netcat_do_patch() { - cd ${S} - quilt pop -a || true - if [ -d ${S}/.pc-netcat ]; then - rm -rf ${S}/.pc - mv ${S}/.pc-netcat ${S}/.pc - QUILT_PATCHES=${S}/debian/patches quilt pop -a - rm -rf ${S}/.pc - fi - QUILT_PATCHES=${S}/debian/patches quilt push -a - mv ${S}/.pc ${S}/.pc-netcat -} - -do_unpack[cleandirs] += "${S}" - -python do_patch() { - bb.build.exec_func('netcat_do_patch', d) - bb.build.exec_func('patch_do_patch', d) -} - -do_compile() { - cd ${S} - pkgrel=4 - oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\"" -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN} -} -ALTERNATIVE_PRIORITY = "60" diff --git a/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb b/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb new file mode 100644 index 000000000..20ad43a4d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb @@ -0,0 +1,56 @@ +require netcat.inc +SUMMARY = "OpenBSD Netcat" +HOMEPAGE = "http://ftp.debian.org" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=f39e60ae4ea9fdb559c833be2e59de99" + +DEPENDS += "glib-2.0 libbsd" +do_patch[depends] = "quilt-native:do_populate_sysroot" + +SRC_URI = "http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ + http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-1.debian.tar.xz;name=netcat-patch;subdir=${BP} \ + file://0001-bundle-own-base64-encode-decode-functions.patch \ + " + +SRC_URI[netcat.md5sum] = "219d5e49c45658e229a3bda63063a986" +SRC_URI[netcat.sha256sum] = "0e283b2a214313c69447cd962c528ac19afb3ddfe606b25de6d179f187cde4c3" +SRC_URI[netcat-patch.md5sum] = "7eba241989dbef6caa78ec4bc8e35151" +SRC_URI[netcat-patch.sha256sum] = "c6736fcbab5254cbbc52278993a951da1126e42800a297c27db297e332e2017e" + +inherit pkgconfig + +EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" + +do_configure[noexec] = "1" + +netcat_do_patch() { + cd ${S} + quilt pop -a || true + if [ -d ${S}/.pc-netcat ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-netcat ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcat +} + +do_unpack[cleandirs] += "${S}" + +python do_patch() { + bb.build.exec_func('netcat_do_patch', d) + bb.build.exec_func('patch_do_patch', d) +} + +do_compile() { + cd ${S} + pkgrel=4 + oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\"" +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN} +} +ALTERNATIVE_PRIORITY = "60" -- cgit v1.2.1