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 13:14:54 +0000 |
commit | 9199c3391380f9ac56a33409c25194486062d7d4 (patch) | |
tree | f9331ca0f403b90bff695433058c3346df888324 /meta/recipes-devtools/apt/apt-package.inc | |
parent | 7e2e2cf50855cd3f3546f0ec33d88075156011a0 (diff) | |
download | poky-9199c3391380f9ac56a33409c25194486062d7d4.tar.gz |
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
(From OE-Core rev: 97403b14765331c8c48bb570c6b98f2809214a9a)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 \ | |||
5 | doc/apt.8 \ | 5 | doc/apt.8 \ |
6 | doc/apt.conf.5 \ | 6 | doc/apt.conf.5 \ |
7 | doc/apt_preferences.5 \ | 7 | doc/apt_preferences.5 \ |
8 | doc/fr/apt-cache.fr.8 \ | ||
9 | doc/fr/apt-cdrom.fr.8 \ | ||
10 | doc/fr/apt-config.fr.8 \ | ||
11 | doc/fr/apt-get.fr.8 \ | ||
12 | doc/fr/apt.conf.fr.5 \ | ||
13 | doc/fr/apt_preferences.fr.5 \ | ||
14 | doc/fr/sources.list.fr.5 \ | ||
15 | doc/es/apt.es.8 \ | ||
16 | doc/es/apt-cache.es.8 \ | ||
17 | doc/es/apt-cdrom.es.8 \ | ||
18 | doc/es/apt-config.es.8 \ | ||
19 | doc/es/apt-get.es.8 \ | ||
20 | doc/es/apt.conf.es.5 \ | ||
21 | doc/es/apt_preferences.es.5 \ | ||
22 | doc/es/sources.list.es.5 \ | ||
23 | doc/pt_BR/apt_preferences.pt_BR.5 \ | ||
24 | doc/ja/apt-cache.ja.8 \ | ||
25 | doc/ja/apt-cdrom.ja.8 \ | ||
26 | doc/ja/apt-get.ja.8 \ | ||
27 | doc/ja/apt.conf.ja.5 \ | ||
28 | doc/sources.list.5" | 8 | doc/sources.list.5" |
29 | apt-utils-manpages="doc/apt-extracttemplates.1 \ | 9 | apt-utils-manpages="doc/apt-extracttemplates.1 \ |
30 | doc/apt-sortpkgs.1 \ | 10 | doc/apt-sortpkgs.1" |
31 | doc/fr/apt-extracttemplates.fr.1 \ | ||
32 | doc/fr/apt-sortpkgs.fr.1" | ||
33 | # doc/fr/apt-ftparchive.fr.1 | ||
34 | # doc/apt-ftparchive.1 | ||
35 | 11 | ||
36 | def get_files_apt_doc(d, bb, manpages): | 12 | def get_files_apt_doc(d, bb, manpages): |
37 | import re | 13 | import re |
@@ -65,8 +41,6 @@ FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}" | |||
65 | 41 | ||
66 | do_install () { | 42 | do_install () { |
67 | set -x | 43 | set -x |
68 | ${@get_commands_apt_doc(d, bb, d.getVar('apt-manpages', True))} | ||
69 | ${@get_commands_apt_doc(d, bb, d.getVar('apt-utils-manpages', True))} | ||
70 | install -d ${D}${bindir} | 44 | install -d ${D}${bindir} |
71 | install -m 0755 bin/apt-cdrom ${D}${bindir}/ | 45 | install -m 0755 bin/apt-cdrom ${D}${bindir}/ |
72 | install -m 0755 bin/apt-get ${D}${bindir}/ | 46 | install -m 0755 bin/apt-get ${D}${bindir}/ |
@@ -76,12 +50,8 @@ do_install () { | |||
76 | install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ | 50 | install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ |
77 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ | 51 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ |
78 | 52 | ||
79 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` | 53 | oe_libinstall -so -C bin libapt-pkg ${D}${libdir} |
80 | eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'` | 54 | oe_libinstall -so -C bin libapt-inst ${D}${libdir} |
81 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ | ||
82 | ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so | ||
83 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ | ||
84 | ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so | ||
85 | 55 | ||
86 | install -d ${D}${libdir}/apt/methods | 56 | install -d ${D}${libdir}/apt/methods |
87 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ | 57 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ |
@@ -94,6 +64,9 @@ do_install () { | |||
94 | install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ | 64 | install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ |
95 | 65 | ||
96 | install -d ${D}${sysconfdir}/apt | 66 | install -d ${D}${sysconfdir}/apt |
67 | install -d ${D}${sysconfdir}/apt/apt.conf.d | ||
68 | install -d ${D}${sysconfdir}/apt/sources.list.d | ||
69 | install -d ${D}${sysconfdir}/apt/preferences.d | ||
97 | install -d ${D}${localstatedir}/lib/apt/lists/partial | 70 | install -d ${D}${localstatedir}/lib/apt/lists/partial |
98 | install -d ${D}${localstatedir}/cache/apt/archives/partial | 71 | install -d ${D}${localstatedir}/cache/apt/archives/partial |
99 | install -d ${D}${docdir}/apt/examples | 72 | install -d ${D}${docdir}/apt/examples |