summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-08-05 14:29:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-11 09:04:11 -0700
commit37c8700560b6da569cdf9d7c306a9aa31dcdf06f (patch)
treefc8d85613c2168d51e3ea00f69035677a0c7ebce
parent82d85bdee7707896cbd432b143eb0ac22c8e3451 (diff)
downloadopenembedded-core-37c8700560b6da569cdf9d7c306a9aa31dcdf06f.tar.gz
apt: update to 1.0.10.1
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/apt/apt-native_1.0.10.1.bb4
-rw-r--r--meta/recipes-devtools/apt/apt-native_1.0.9.9.bb9
-rw-r--r--meta/recipes-devtools/apt/apt.inc5
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/0001-fix-the-gcc-version-check.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/0001-remove-Wsuggest-attribute-from-CFLAGS.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/disable-configure-in-makefile.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/disable-test.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/fix-gcc-4.6-null-not-defined.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/makerace.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/makerace.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/no-nls-dpkg.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/no-nls-dpkg.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/noconfigure.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/noconfigure.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/nodoc.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/nodoc.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/truncate-filename.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/truncate-filename.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt/use-host.patch (renamed from meta/recipes-devtools/apt/apt-1.0.9.9/use-host.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt_1.0.10.1.bb (renamed from meta/recipes-devtools/apt/apt_1.0.9.9.bb)4
16 files changed, 8 insertions, 14 deletions
diff --git a/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb b/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb
new file mode 100644
index 0000000000..1e660da74b
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb
@@ -0,0 +1,4 @@
+require apt-native.inc
+
+SRC_URI += "file://noconfigure.patch \
+ file://no-curl.patch"
diff --git a/meta/recipes-devtools/apt/apt-native_1.0.9.9.bb b/meta/recipes-devtools/apt/apt-native_1.0.9.9.bb
deleted file mode 100644
index cbaf25be68..0000000000
--- a/meta/recipes-devtools/apt/apt-native_1.0.9.9.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require apt-native.inc
-
-SRC_URI += "file://noconfigure.patch \
- file://no-curl.patch"
-
-SRC_URI[md5sum] = "e70c6d6227883cfc0dda6bc5db509bca"
-SRC_URI[sha256sum] = "96bebcd7bfee0b2386741a8315182ba39487bdd743ecf5c1fc5b8b889cca2478"
-
-LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 94bd6e9c45..3248b9a7b2 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -2,7 +2,7 @@ SUMMARY = "Advanced front-end for dpkg"
LICENSE = "GPLv2.0+"
SECTION = "base"
-SRC_URI = "http://snapshot.debian.org/archive/debian/20150428T221633Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \
+SRC_URI = "http://snapshot.debian.org/archive/debian/20150805T094928Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \
file://use-host.patch \
file://makerace.patch \
file://no-nls-dpkg.patch \
@@ -12,6 +12,9 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20150428T221633Z/pool/main/
file://disable-configure-in-makefile.patch \
file://disable-test.patch \
"
+SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276"
+SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543"
+LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
inherit autotools gettext
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
index d33069b73a..d33069b73a 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
+++ b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/0001-fix-the-gcc-version-check.patch b/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
index beea56d2ae..beea56d2ae 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/0001-fix-the-gcc-version-check.patch
+++ b/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/0001-remove-Wsuggest-attribute-from-CFLAGS.patch b/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
index 7c42ff07b8..7c42ff07b8 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
+++ b/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/disable-configure-in-makefile.patch b/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
index 7c2f64e3e6..7c2f64e3e6 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/disable-configure-in-makefile.patch
+++ b/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch b/meta/recipes-devtools/apt/apt/disable-test.patch
index 676795dc8a..676795dc8a 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch
+++ b/meta/recipes-devtools/apt/apt/disable-test.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
index 801ae6dddb..801ae6dddb 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/fix-gcc-4.6-null-not-defined.patch
+++ b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/makerace.patch b/meta/recipes-devtools/apt/apt/makerace.patch
index 46e3161b67..46e3161b67 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/makerace.patch
+++ b/meta/recipes-devtools/apt/apt/makerace.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
index a0996d4d44..a0996d4d44 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/no-nls-dpkg.patch
+++ b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/noconfigure.patch b/meta/recipes-devtools/apt/apt/noconfigure.patch
index ebc67203b4..ebc67203b4 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/noconfigure.patch
+++ b/meta/recipes-devtools/apt/apt/noconfigure.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/nodoc.patch b/meta/recipes-devtools/apt/apt/nodoc.patch
index 449e42df4a..449e42df4a 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/nodoc.patch
+++ b/meta/recipes-devtools/apt/apt/nodoc.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/truncate-filename.patch b/meta/recipes-devtools/apt/apt/truncate-filename.patch
index db1c42b66c..db1c42b66c 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/truncate-filename.patch
+++ b/meta/recipes-devtools/apt/apt/truncate-filename.patch
diff --git a/meta/recipes-devtools/apt/apt-1.0.9.9/use-host.patch b/meta/recipes-devtools/apt/apt/use-host.patch
index b30fcff0d6..b30fcff0d6 100644
--- a/meta/recipes-devtools/apt/apt-1.0.9.9/use-host.patch
+++ b/meta/recipes-devtools/apt/apt/use-host.patch
diff --git a/meta/recipes-devtools/apt/apt_1.0.9.9.bb b/meta/recipes-devtools/apt/apt_1.0.10.1.bb
index 4c40d0dd49..bf77e2a301 100644
--- a/meta/recipes-devtools/apt/apt_1.0.9.9.bb
+++ b/meta/recipes-devtools/apt/apt_1.0.10.1.bb
@@ -1,11 +1,7 @@
DEPENDS = "curl db"
RDEPENDS_${PN} = "dpkg bash debianutils"
-LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
require apt.inc
-SRC_URI[md5sum] = "e70c6d6227883cfc0dda6bc5db509bca"
-SRC_URI[sha256sum] = "96bebcd7bfee0b2386741a8315182ba39487bdd743ecf5c1fc5b8b889cca2478"
-
require apt-package.inc
PACKAGECONFIG ??= "lzma"