From: Andreas Oberritter <obi@opendreambox.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 08/33] apt: merge apt-package.inc into .bb
Date: Thu, 8 Dec 2016 22:47:32 +0100 [thread overview]
Message-ID: <1481233677-27298-9-git-send-email-obi@opendreambox.org> (raw)
In-Reply-To: <1481233677-27298-1-git-send-email-obi@opendreambox.org>
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/apt/apt-package.inc | 78 ------------------------------
meta/recipes-devtools/apt/apt_1.2.12.bb | 79 ++++++++++++++++++++++++++++++-
2 files changed, 78 insertions(+), 79 deletions(-)
delete mode 100644 meta/recipes-devtools/apt/apt-package.inc
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
deleted file mode 100644
index a553aa2..0000000
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-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"
-FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \
- ${bindir}/apt-config ${bindir}/apt-cache \
- ${libdir}/apt ${libdir}/libapt*.so.* \
- ${localstatedir} ${sysconfdir} \
- ${libdir}/dpkg"
-FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
-FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-manpages', True))} \
- ${docdir}/apt"
-FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-utils-manpages', True))}"
-FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
-
-do_install () {
- set -x
- install -d ${D}${bindir}
- install -m 0755 bin/apt-key ${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}/
-
- oe_libinstall -so -C bin libapt-pkg ${D}${libdir}
- oe_libinstall -so -C bin libapt-inst ${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/sources.list.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}${docdir}/apt/examples
- install -m 0644 ${S}/doc/examples/* ${D}${docdir}/apt/examples/
-
- install -d ${D}${includedir}/apt-pkg/
- install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/
-}
diff --git a/meta/recipes-devtools/apt/apt_1.2.12.bb b/meta/recipes-devtools/apt/apt_1.2.12.bb
index ae0bce9..3efa14e 100644
--- a/meta/recipes-devtools/apt/apt_1.2.12.bb
+++ b/meta/recipes-devtools/apt/apt_1.2.12.bb
@@ -2,7 +2,84 @@ DEPENDS = "curl db zlib"
RDEPENDS_${PN} = "dpkg bash debianutils"
require apt.inc
-require apt-package.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"
+FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \
+ ${bindir}/apt-config ${bindir}/apt-cache \
+ ${libdir}/apt ${libdir}/libapt*.so.* \
+ ${localstatedir} ${sysconfdir} \
+ ${libdir}/dpkg"
+FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
+FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-manpages', True))} \
+ ${docdir}/apt"
+FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-utils-manpages', True))}"
+FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
+
+do_install () {
+ set -x
+ install -d ${D}${bindir}
+ install -m 0755 bin/apt-key ${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}/
+
+ oe_libinstall -so -C bin libapt-pkg ${D}${libdir}
+ oe_libinstall -so -C bin libapt-inst ${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/sources.list.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}${docdir}/apt/examples
+ install -m 0644 ${S}/doc/examples/* ${D}${docdir}/apt/examples/
+
+ install -d ${D}${includedir}/apt-pkg/
+ install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/
+}
PACKAGECONFIG ??= "lzma"
PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz"
--
2.7.4
next prev parent reply other threads:[~2016-12-08 21:48 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-08 21:47 [PATCH v2 00/33] Accumulated patches for deb packaging Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 01/33] dpkg: implement offline mode for update-alternatives Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 02/33] dpkg: update-alternatives-dpkg should conflict with other providers Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 03/33] dpkg-native: hardcode SYSCONFDIR to sysconfdir_native in update-alternatives Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 04/33] apt-native: Use option --force-script-chrootless for rootfs Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 05/33] package_manager/deb: pass option --force-script-chrootless to dpkg Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 06/33] debianutils: Allow native builds Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 07/33] apt-native: merge apt-native.inc into .bb Andreas Oberritter
2016-12-08 21:47 ` Andreas Oberritter [this message]
2016-12-08 21:47 ` [PATCH v2 09/33] apt-native: use sed to prepare apt.conf.sample Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 10/33] apt: use default packaging rules for manpages Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 11/33] apt: use default packaging rules for base package, prepend apt-utils Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 12/33] apt: use default packaging rules for -dev package Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 13/33] apt: rewrite do_install Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 14/33] apt-native: drop obsolete patches Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 15/33] apt: merge with apt-native Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 16/33] apt: merge apt.inc into .bb Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 17/33] apt: group variables (license, configuration, packaging) Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 18/33] apt: more fine-grained packaging Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 19/33] apt: recommend gnupg Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 20/33] package_manager/deb: let apt-get handle postinst scripts Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 21/33] package_manager/deb: create Packages.xz Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 22/33] package_manager/deb: implement BAD_RECOMMENDATIONS Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 23/33] dpkg: use PACKAGECONFIG Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 24/33] dpkg: set license field to more common "GPLv2+" Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 25/33] dpkg: clean-up packaging of start-stop-daemon Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 26/33] dpkg: remove unneeded do_configure override Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 27/33] dpkg: simplify replacing perl interpreter in scripts Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 28/33] dpkg: update packages and files to match Debian more closely Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 29/33] dpkg: always install dpkg-configure.service Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 30/33] dpkg: use correct path for perl libraries Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 31/33] package_deb.bbclass: compress control.tar with the same algorithm as data.tar Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 32/33] apt: fix rpath error during configure Andreas Oberritter
2016-12-08 21:47 ` [PATCH v2 33/33] apt: dselect depends on perl Andreas Oberritter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1481233677-27298-9-git-send-email-obi@opendreambox.org \
--to=obi@opendreambox.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox