diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-04-22 01:58:31 +0200 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2018-05-07 23:25:22 +0200 |
commit | 36ecaf6cd6f70be1b1bc31ff9b9433bb0cb16cac (patch) | |
tree | 9db8e9e0fa8dd3fb0d70ff26c9bcb15a0cc431ea | |
parent | c646af671161c8a1d6d234f2f056211a1a35e285 (diff) | |
download | openembedded-core-contrib-36ecaf6cd6f70be1b1bc31ff9b9433bb0cb16cac.tar.gz |
apt: merge apt.inc into .bb
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r-- | meta/recipes-devtools/apt/apt.inc | 38 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt_1.2.12.bb | 39 |
2 files changed, 38 insertions, 39 deletions
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc deleted file mode 100644 index 14886648b9..0000000000 --- a/meta/recipes-devtools/apt/apt.inc +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Advanced front-end for dpkg" -LICENSE = "GPLv2.0+" -SECTION = "base" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20160526T162943Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \ - file://use-host.patch \ - file://makerace.patch \ - file://no-nls-dpkg.patch \ - file://fix-gcc-4.6-null-not-defined.patch \ - file://truncate-filename.patch \ - file://nodoc.patch \ - file://disable-configure-in-makefile.patch \ - file://disable-test.patch \ - file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \ - file://0001-apt-1.2.12-Fix-musl-build.patch \ - file://0001-remove-Wsuggest-attribute-from-CFLAGS.patch \ - file://0001-fix-the-gcc-version-check.patch \ - file://apt.conf.in \ - " -SRC_URI[md5sum] = "80f6f0ef110a45a7e5af8a9d233fb0e7" -SRC_URI[sha256sum] = "e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6" -LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" - -# the package is taken from snapshots.debian.org; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" - -inherit autotools gettext useradd - -EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" - -do_configure_prepend() { - rm -rf ${S}/buildlib/config.sub - rm -rf ${S}/buildlib/config.guess -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /nonexistent --shell /bin/false --user-group _apt" diff --git a/meta/recipes-devtools/apt/apt_1.2.12.bb b/meta/recipes-devtools/apt/apt_1.2.12.bb index 92a6fa0955..0d47737038 100644 --- a/meta/recipes-devtools/apt/apt_1.2.12.bb +++ b/meta/recipes-devtools/apt/apt_1.2.12.bb @@ -1,6 +1,43 @@ +SUMMARY = "Advanced front-end for dpkg" +SECTION = "base" +LICENSE = "GPLv2.0+" DEPENDS = "curl db zlib" RDEPENDS_${PN} = "dpkg bash debianutils" -require apt.inc + +SRC_URI = "http://snapshot.debian.org/archive/debian/20160526T162943Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \ + file://use-host.patch \ + file://makerace.patch \ + file://no-nls-dpkg.patch \ + file://fix-gcc-4.6-null-not-defined.patch \ + file://truncate-filename.patch \ + file://nodoc.patch \ + file://disable-configure-in-makefile.patch \ + file://disable-test.patch \ + file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \ + file://0001-apt-1.2.12-Fix-musl-build.patch \ + file://0001-remove-Wsuggest-attribute-from-CFLAGS.patch \ + file://0001-fix-the-gcc-version-check.patch \ + file://apt.conf.in \ + " +SRC_URI[md5sum] = "80f6f0ef110a45a7e5af8a9d233fb0e7" +SRC_URI[sha256sum] = "e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6" +LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" + +# the package is taken from snapshots.debian.org; that source is static and goes stale +# so we check the latest upstream from a directory that does get updated +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" + +inherit autotools gettext useradd + +EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" + +do_configure_prepend() { + rm -rf ${S}/buildlib/config.sub + rm -rf ${S}/buildlib/config.guess +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /nonexistent --shell /bin/false --user-group _apt" USE_NLS_class-native = "yes" |