From 3cb5b2d34043c2988bf8fba25aec26e2c4edd368 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 22 Apr 2016 00:55:12 +0200 Subject: apt: use default packaging rules for manpages Signed-off-by: Andreas Oberritter --- meta/recipes-devtools/apt/apt_1.2.31.bb | 35 +-------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'meta') diff --git a/meta/recipes-devtools/apt/apt_1.2.31.bb b/meta/recipes-devtools/apt/apt_1.2.31.bb index ba39ce3b75..c15168b729 100644 --- a/meta/recipes-devtools/apt/apt_1.2.31.bb +++ b/meta/recipes-devtools/apt/apt_1.2.31.bb @@ -2,36 +2,7 @@ DEPENDS = "curl db zlib" RDEPENDS_${PN} = "dpkg bash debianutils" require apt.inc -apt-manpages="doc/apt-cache.8 \ - doc/apt-cdrom.8 \ - doc/apt-config.8 \ - doc/apt-get.8 \ - doc/apt.8 \ - doc/apt.conf.5 \ - doc/apt_preferences.5 \ - doc/sources.list.5" -apt-utils-manpages="doc/apt-extracttemplates.1 \ - doc/apt-sortpkgs.1" - -def get_files_apt_doc(d, bb, manpages): - import re - manpages = re.sub(r'\bdoc/(\S+)/(\S+)\.\1\.(.)\b', r'${mandir}/\1/man\3/\2.\3', manpages) - manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\2/\1.\2', manpages) - return manpages - -def get_commands_apt_doc(d, bb, manpages): - s = list() - __dir_cache__ = list() - for m in manpages.split(): - dest = get_files_apt_doc(d, bb, m) - dir = os.path.dirname(dest) - if not dir in __dir_cache__: - s.append("install -d ${D}/%s" % dir) - __dir_cache__.append(dir) - s.append("install -m 0644 %s ${D}/%s" % (m, dest)) - return "\n".join(s) - -PACKAGES += "${PN}-utils ${PN}-utils-doc" +PACKAGES += "${PN}-utils" FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \ ${bindir}/apt-config ${bindir}/apt-cache \ ${libdir}/apt ${libdir}/libapt*.so.* \ @@ -41,9 +12,6 @@ FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \ " RDEPENDS_${PN} += "perl" FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" -FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-manpages'))} \ - ${docdir}/apt" -FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-utils-manpages'))}" FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}" inherit systemd @@ -103,7 +71,6 @@ PACKAGECONFIG[bz2] = "ac_cv_lib_bz2_BZ2_bzopen=yes,ac_cv_lib_bz2_BZ2_bzopen=no,b 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 -- cgit 1.2.3-korg