zip: update SRC_URI

The infozip FTP server appears to have been taken down, so change the SRC_URI to
point at their SourceForge project.

Also as the SRC_URI can't be generated from the version and there is no other
user of the .inc, merge the .bb and .inc together.

[ YOCTO #9655 ]

(From OE-Core rev: 5cb1e0ec46e4fde1c15aeb6812eaaece4840ac1c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 27 deletions

diff --git a/meta/recipes-extended/zip/zip.inc b/meta/recipes-extended/zip/zip.inc
deleted file mode 100644
index 21985a4a08..0000000000
--- a/meta/recipes-extended/zip/zip.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Compressor/archiver for creating and modifying .zip files"
-HOMEPAGE = "http://www.info-zip.org"
-SECTION = "console/utils"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
-
-SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@d.getVar('PV',1).replace('.', '')}.tgz \
-            file://fix-security-format.patch"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
-                'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
-                'BINFLAGS=0755' 'INSTALL_D=install -d'"
-
-do_compile() {
-        oe_runmake -f unix/Makefile flags IZ_BZIP2=no_such_directory
-        sed -i 's#LFLAGS1=""#LFLAGS1="${LDFLAGS}"#' flags
-        oe_runmake -f unix/Makefile generic IZ_BZIP2=no_such_directory
-}
-
-do_install() {
-        oe_runmake -f unix/Makefile prefix=${D}${prefix} \
-                   BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
-                   install
-}
-
-BBCLASSEXTEND = "native"