apt: use default packaging rules for base package, prepend apt-utils

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

diff --git a/meta/recipes-devtools/apt/apt_1.2.31.bb b/meta/recipes-devtools/apt/apt_1.2.31.bb
index c15168b7296606ddbc1d6b1d36e25c0bdf36e173..a075044008fd8599a9138b99944766f2b6b340ec 100644 (file)
--- a/meta/recipes-devtools/apt/apt_1.2.31.bb
+++ b/meta/recipes-devtools/apt/apt_1.2.31.bb
@@ -2,14 +2,8 @@ DEPENDS = "curl db zlib"
 RDEPENDS_${PN} = "dpkg bash debianutils"
 require apt.inc
 
-PACKAGES += "${PN}-utils"
-FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \
-              ${bindir}/apt-config ${bindir}/apt-cache \
-              ${libdir}/apt ${libdir}/libapt*.so.* \
-              ${localstatedir} ${sysconfdir} \
-              ${libdir}/dpkg \
-              ${systemd_unitdir}/system \
-           "
+PACKAGES =+ "${PN}-utils"
+FILES_${PN} += "${libdir}/dpkg ${systemd_system_unitdir}/apt-daily.service"
 RDEPENDS_${PN} += "perl"
 FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
 FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
@@ -70,8 +64,6 @@ 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"
 
-FILES_${PN} += "${bindir}/apt-key"
-
 do_install_append() {
     #Write the correct apt-architecture to apt.conf
     APT_CONF=${D}/etc/apt/apt.conf