apt: merge with apt-native

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

diff --git a/meta/recipes-devtools/apt/apt-native_1.2.31.bb b/meta/recipes-devtools/apt/apt-native_1.2.31.bb
deleted file mode 100644 (file)
index 7de7107..0000000
--- a/meta/recipes-devtools/apt/apt-native_1.2.31.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-require apt.inc
-inherit native
-
-DEPENDS += "dpkg-native gettext-native db-native curl-native xz-native"
-PACKAGES = ""
-USE_NLS = "yes"
-
-SRC_URI += "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 \
-            file://apt.conf.in \
-"
-
-do_install() {
-       install -d ${D}${bindir}
-       install -m 0755 bin/apt-cdrom ${D}${bindir}/
-       install -m 0755 bin/apt-get ${D}${bindir}/
-       install -m 0755 bin/apt-config ${D}${bindir}/
-       install -m 0755 bin/apt-cache ${D}${bindir}/
-       install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
-       install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
-       install -m 0755 bin/apt-ftparchive ${D}${bindir}/
-
-       oe_libinstall -so -C bin libapt-private ${D}${libdir}/
-
-       oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/
-       oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/
-
-       install -d ${D}${libdir}/apt/methods
-       install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
-
-       install -d ${D}${libdir}/dpkg/methods/apt
-       install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/ 
-
-       install -d ${D}${sysconfdir}/apt
-       install -d ${D}${sysconfdir}/apt/apt.conf.d
-       install -d ${D}${sysconfdir}/apt/preferences.d
-       install -d ${D}${localstatedir}/lib/apt/lists/partial
-       install -d ${D}${localstatedir}/cache/apt/archives/partial
-
-       install -d ${D}${localstatedir}/log/apt/
-
-       install -d ${D}${includedir}/apt-pkg
-       for h in `find ${S}/apt-pkg ${S}/apt-inst -name '*.h'`
-       do
-               install -m 0644 $h ${D}${includedir}/apt-pkg
-       done
-
-       sed -e "s,@STAGING_DIR_NATIVE@,${STAGING_DIR_NATIVE},g" \
-           -e "s,@STAGING_BINDIR_NATIVE@,${STAGING_BINDIR_NATIVE},g" \
-           -e "s,@STAGING_LIBDIR@,${STAGING_LIBDIR},g" \
-           < ${WORKDIR}/apt.conf.in > ${D}${sysconfdir}/apt/apt.conf.sample
-}

diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 6883ac865a8045d4f837c2a39cd4e714a64f8fac..295fb6ccb94beb4741a346eb47546fd5f680708c 100644 (file)
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -17,6 +17,10 @@ SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/${BPN}/${P
            file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \
            file://0001-apt-1.2.12-Fix-musl-build.patch \
            file://0001-Include-array.h-for-std-array.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 \
+           file://apt.conf.in \
            "
 SRC_URI[md5sum] = "d30eed9304e82ea8238c854b5c5a34d9"
 SRC_URI[sha256sum] = "03ded4f5e9b8d43ecec083704b2dcabf20c182ed382db9ac7251da0b0b038059"

diff --git a/meta/recipes-devtools/apt/apt_1.2.31.bb b/meta/recipes-devtools/apt/apt_1.2.31.bb
index 898b83e61eaff8d7c3a38999c0667ce7861b3acc..306e836fbd6086a37eecdb2399974c4cce8c1c45 100644 (file)
--- a/meta/recipes-devtools/apt/apt_1.2.31.bb
+++ b/meta/recipes-devtools/apt/apt_1.2.31.bb
@@ -2,6 +2,8 @@ DEPENDS = "curl db zlib"
 RDEPENDS_${PN} = "dpkg bash debianutils"
 require apt.inc
 
+USE_NLS_class-native = "yes"
+
 PACKAGES =+ "${PN}-utils"
 FILES_${PN} += "${libdir}/dpkg ${systemd_system_unitdir}/apt-daily.service"
 RDEPENDS_${PN} += "perl"
@@ -74,7 +76,16 @@ PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_
 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"
 
+do_install_append_class-native() {
+    sed -e "s,@STAGING_DIR_NATIVE@,${STAGING_DIR_NATIVE},g" \
+        -e "s,@STAGING_BINDIR_NATIVE@,${STAGING_BINDIR_NATIVE},g" \
+        -e "s,@STAGING_LIBDIR@,${STAGING_LIBDIR},g" \
+        < ${WORKDIR}/apt.conf.in > ${D}${sysconfdir}/apt/apt.conf.sample
+}
+
 do_install_append_class-target() {
     #Write the correct apt-architecture to apt.conf
     echo 'APT::Architecture "${DPKG_ARCH}";' > ${D}${sysconfdir}/apt/apt.conf
 }
+
+BBCLASSEXTEND = "native"