diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2013-03-01 17:06:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-05 12:29:45 +0000 |
commit | 97403b14765331c8c48bb570c6b98f2809214a9a (patch) | |
tree | 15dfbce0de9579179a941ad36d4bfa9f51451ce6 /meta/recipes-devtools/apt/apt-package.inc | |
parent | 59cd32a6661d76ee070810823614eb797d6cc153 (diff) | |
download | openembedded-core-97403b14765331c8c48bb570c6b98f2809214a9a.tar.gz openembedded-core-97403b14765331c8c48bb570c6b98f2809214a9a.tar.bz2 openembedded-core-97403b14765331c8c48bb570c6b98f2809214a9a.zip |
apt: upgrade to 0.9.7.7
bb files: remove invalid config.sub/config.guess files (autotools will
generate the correct files)
allocate-larger-memory.patch: not needed anymore
fix-gcc-4.6-null-not-defined.patch: added
- include header that defines NULL
includes-fix.patch: not needed anymore
localefixes.patch: removed
- not necessary anymore (no compiling errors)
makerace.patch: adapted to the new version
no-ko-translation.patch: adapted to the new version
no-nls-dpkg.patch: added
- fix build without nls
noconfigure.patch: adapted to the new version
nodoc.patch: adapted to the new version (apply patch on all cases
because the doc generation needs docbook-xsl)
remove-redeclaration.patch: not needed anymore
truncate-filename.patch: moved
use-host.patch: adapted to the new version
no-curl.patch: adapted to the new version
disable-configure-in-makefile.patch: added
- do not run configure at do_compile
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-package.inc')
-rw-r--r-- | meta/recipes-devtools/apt/apt-package.inc | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc index 762ecf7af3..b0e5056f21 100644 --- a/meta/recipes-devtools/apt/apt-package.inc +++ b/meta/recipes-devtools/apt/apt-package.inc @@ -5,33 +5,9 @@ apt-manpages="doc/apt-cache.8 \ doc/apt.8 \ doc/apt.conf.5 \ doc/apt_preferences.5 \ - doc/fr/apt-cache.fr.8 \ - doc/fr/apt-cdrom.fr.8 \ - doc/fr/apt-config.fr.8 \ - doc/fr/apt-get.fr.8 \ - doc/fr/apt.conf.fr.5 \ - doc/fr/apt_preferences.fr.5 \ - doc/fr/sources.list.fr.5 \ - doc/es/apt.es.8 \ - doc/es/apt-cache.es.8 \ - doc/es/apt-cdrom.es.8 \ - doc/es/apt-config.es.8 \ - doc/es/apt-get.es.8 \ - doc/es/apt.conf.es.5 \ - doc/es/apt_preferences.es.5 \ - doc/es/sources.list.es.5 \ - doc/pt_BR/apt_preferences.pt_BR.5 \ - doc/ja/apt-cache.ja.8 \ - doc/ja/apt-cdrom.ja.8 \ - doc/ja/apt-get.ja.8 \ - doc/ja/apt.conf.ja.5 \ doc/sources.list.5" apt-utils-manpages="doc/apt-extracttemplates.1 \ - doc/apt-sortpkgs.1 \ - doc/fr/apt-extracttemplates.fr.1 \ - doc/fr/apt-sortpkgs.fr.1" -# doc/fr/apt-ftparchive.fr.1 -# doc/apt-ftparchive.1 + doc/apt-sortpkgs.1" def get_files_apt_doc(d, bb, manpages): import re @@ -65,8 +41,6 @@ FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}" do_install () { set -x - ${@get_commands_apt_doc(d, bb, d.getVar('apt-manpages', True))} - ${@get_commands_apt_doc(d, bb, d.getVar('apt-utils-manpages', True))} install -d ${D}${bindir} install -m 0755 bin/apt-cdrom ${D}${bindir}/ install -m 0755 bin/apt-get ${D}${bindir}/ @@ -76,12 +50,8 @@ do_install () { install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ - ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ - ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so + 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/ @@ -94,6 +64,9 @@ do_install () { install -m 0755 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 |