From b414b95a0e0fc5b5e1403272eaaf59e0bec6da06 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 29 Jun 2019 18:53:25 +0200 Subject: apt: update to 1.2.31 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/apt-native_1.2.24.bb | 7 ------- meta/recipes-devtools/apt/apt-native_1.2.31.bb | 7 +++++++ meta/recipes-devtools/apt/apt.inc | 4 ++-- meta/recipes-devtools/apt/apt_1.2.24.bb | 20 -------------------- meta/recipes-devtools/apt/apt_1.2.31.bb | 20 ++++++++++++++++++++ 5 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt-native_1.2.24.bb create mode 100644 meta/recipes-devtools/apt/apt-native_1.2.31.bb delete mode 100644 meta/recipes-devtools/apt/apt_1.2.24.bb create mode 100644 meta/recipes-devtools/apt/apt_1.2.31.bb (limited to 'meta') diff --git a/meta/recipes-devtools/apt/apt-native_1.2.24.bb b/meta/recipes-devtools/apt/apt-native_1.2.24.bb deleted file mode 100644 index 5b16b503d5..0000000000 --- a/meta/recipes-devtools/apt/apt-native_1.2.24.bb +++ /dev/null @@ -1,7 +0,0 @@ -require apt-native.inc - -SRC_URI += "file://noconfigure.patch \ - file://no-curl.patch \ - file://gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch \ - file://gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch \ - file://gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch" diff --git a/meta/recipes-devtools/apt/apt-native_1.2.31.bb b/meta/recipes-devtools/apt/apt-native_1.2.31.bb new file mode 100644 index 0000000000..5b16b503d5 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-native_1.2.31.bb @@ -0,0 +1,7 @@ +require apt-native.inc + +SRC_URI += "file://noconfigure.patch \ + file://no-curl.patch \ + file://gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch \ + file://gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch \ + file://gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch" diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 842c30240b..b855099e52 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -15,8 +15,8 @@ SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/${BPN}/${P file://0001-apt-1.2.12-Fix-musl-build.patch \ file://0001-Include-array.h-for-std-array.patch \ " -SRC_URI[md5sum] = "ce8f9ab11f4fd0a08ec73eaffd75c8f0" -SRC_URI[sha256sum] = "fa1311a9ce00e72379a0a3bc6d240ba30c0968cfbbb3472859e50b99e24e9598" +SRC_URI[md5sum] = "d30eed9304e82ea8238c854b5c5a34d9" +SRC_URI[sha256sum] = "03ded4f5e9b8d43ecec083704b2dcabf20c182ed382db9ac7251da0b0b038059" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale diff --git a/meta/recipes-devtools/apt/apt_1.2.24.bb b/meta/recipes-devtools/apt/apt_1.2.24.bb deleted file mode 100644 index ae0bce933d..0000000000 --- a/meta/recipes-devtools/apt/apt_1.2.24.bb +++ /dev/null @@ -1,20 +0,0 @@ -DEPENDS = "curl db zlib" -RDEPENDS_${PN} = "dpkg bash debianutils" -require apt.inc - -require apt-package.inc - -PACKAGECONFIG ??= "lzma" -PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz" -PACKAGECONFIG[bz2] = "ac_cv_lib_bz2_BZ2_bzopen=yes,ac_cv_lib_bz2_BZ2_bzopen=no,bzip2" -PACKAGECONFIG[lz4] = "ac_cv_lib_lz4_LZ4F_createCompressionContext=yes,ac_cv_lib_lz4_LZ4F_createCompressionContext=no,lz4" - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -do_install_append() { - #Write the correct apt-architecture to apt.conf - APT_CONF=${D}/etc/apt/apt.conf - echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF} - oe_libinstall -so -C bin libapt-private ${D}${libdir}/ -} diff --git a/meta/recipes-devtools/apt/apt_1.2.31.bb b/meta/recipes-devtools/apt/apt_1.2.31.bb new file mode 100644 index 0000000000..ae0bce933d --- /dev/null +++ b/meta/recipes-devtools/apt/apt_1.2.31.bb @@ -0,0 +1,20 @@ +DEPENDS = "curl db zlib" +RDEPENDS_${PN} = "dpkg bash debianutils" +require apt.inc + +require apt-package.inc + +PACKAGECONFIG ??= "lzma" +PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz" +PACKAGECONFIG[bz2] = "ac_cv_lib_bz2_BZ2_bzopen=yes,ac_cv_lib_bz2_BZ2_bzopen=no,bzip2" +PACKAGECONFIG[lz4] = "ac_cv_lib_lz4_LZ4F_createCompressionContext=yes,ac_cv_lib_lz4_LZ4F_createCompressionContext=no,lz4" + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" + +do_install_append() { + #Write the correct apt-architecture to apt.conf + APT_CONF=${D}/etc/apt/apt.conf + echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF} + oe_libinstall -so -C bin libapt-private ${D}${libdir}/ +} -- cgit 1.2.3-korg