diff options
Diffstat (limited to 'meta/recipes-devtools/apt')
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch | 35 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/use-host.patch | 44 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 63 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-native_0.7.14.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-package.inc | 104 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt.inc | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt_0.7.14.bb | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/apt.conf | 43 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/db_linking_hack.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/environment.patch | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/no-curl.patch | 44 |
14 files changed, 492 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch b/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch new file mode 100644 index 0000000000..f4661648ea --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Add missing includes required when building with modern toolchain, based on | ||
2 | patch from Debian bugzilla: | ||
3 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505954 | ||
4 | |||
5 | Should no longer be required once upgraded to 0.7.22 or later. | ||
6 | |||
7 | Index: apt-0.7.14/apt-pkg/acquire.cc | ||
8 | =================================================================== | ||
9 | --- apt-0.7.14.orig/apt-pkg/acquire.cc 2008-05-28 14:22:13.000000000 +0100 | ||
10 | +++ apt-0.7.14/apt-pkg/acquire.cc 2010-07-23 17:30:11.494883936 +0100 | ||
11 | @@ -22,6 +22,7 @@ | ||
12 | |||
13 | #include <apti18n.h> | ||
14 | |||
15 | +#include <cstdio> | ||
16 | #include <iostream> | ||
17 | #include <sstream> | ||
18 | |||
19 | Index: apt-0.7.14/apt-pkg/contrib/sha256.h | ||
20 | =================================================================== | ||
21 | --- apt-0.7.14.orig/apt-pkg/contrib/sha256.h 2008-05-28 14:22:14.000000000 +0100 | ||
22 | +++ apt-0.7.14/apt-pkg/contrib/sha256.h 2010-07-23 17:30:11.494883936 +0100 | ||
23 | @@ -14,6 +14,7 @@ | ||
24 | #ifndef APTPKG_SHA256_H | ||
25 | #define APTPKG_SHA256_H | ||
26 | |||
27 | +#include <stdint.h> | ||
28 | #include <string> | ||
29 | #include <cstring> | ||
30 | #include <algorithm> | ||
31 | Index: apt-0.7.14/apt-pkg/deb/dpkgpm.cc | ||
32 | =================================================================== | ||
33 | --- apt-0.7.14.orig/apt-pkg/deb/dpkgpm.cc 2008-05-28 14:22:14.000000000 +0100 | ||
34 | +++ apt-0.7.14/apt-pkg/deb/dpkgpm.cc 2010-07-23 17:30:36.960856870 +0100 | ||
35 | @@ -20,6 +20,7 @@ | ||
36 | #include <stdlib.h> | ||
37 | #include <fcntl.h> | ||
38 | #include <sys/select.h> | ||
39 | +#include <sys/stat.h> | ||
40 | #include <sys/types.h> | ||
41 | #include <sys/wait.h> | ||
42 | #include <signal.h> | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch new file mode 100644 index 0000000000..5f3634b32a --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch | |||
@@ -0,0 +1,9 @@ | |||
1 | --- | ||
2 | po/LINGUAS | 2 +- | ||
3 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
4 | |||
5 | --- apt-0.7.14.orig/po/LINGUAS | ||
6 | +++ apt-0.7.14/po/LINGUAS | ||
7 | @@ -1 +1 @@ | ||
8 | -ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW | ||
9 | +ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | --- | ||
2 | apt-pkg/packagemanager.cc | 4 ++++ | ||
3 | 1 file changed, 4 insertions(+) | ||
4 | |||
5 | --- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc | ||
6 | +++ apt-0.6.45exp2/apt-pkg/packagemanager.cc | ||
7 | @@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI | ||
8 | |||
9 | List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); | ||
10 | |||
11 | +#if 0 | ||
12 | // Perform immedate configuration of the package. | ||
13 | if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) | ||
14 | if (SmartConfigure(Pkg) == false) | ||
15 | return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); | ||
16 | +#endif | ||
17 | |||
18 | return true; | ||
19 | } | ||
20 | @@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag | ||
21 | DoneSomething = true; | ||
22 | } | ||
23 | |||
24 | +#if 0 | ||
25 | // Final run through the configure phase | ||
26 | if (ConfigureAll() == false) | ||
27 | return Failed; | ||
28 | @@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag | ||
29 | return Failed; | ||
30 | } | ||
31 | } | ||
32 | +#endif | ||
33 | |||
34 | return Completed; | ||
35 | } | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch b/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch new file mode 100644 index 0000000000..db8cf93717 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | --- | ||
2 | Makefile | 2 +- | ||
3 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
4 | |||
5 | --- apt-0.7.14.orig/Makefile | ||
6 | +++ apt-0.7.14/Makefile | ||
7 | @@ -15,11 +15,11 @@ all headers library clean veryclean bina | ||
8 | $(MAKE) -C apt-inst $@ | ||
9 | $(MAKE) -C methods $@ | ||
10 | $(MAKE) -C cmdline $@ | ||
11 | $(MAKE) -C ftparchive $@ | ||
12 | $(MAKE) -C dselect $@ | ||
13 | - $(MAKE) -C doc $@ | ||
14 | +# $(MAKE) -C doc $@ | ||
15 | $(MAKE) -C po $@ | ||
16 | |||
17 | # Some very common aliases | ||
18 | .PHONY: maintainer-clean dist-clean distclean pristine sanity | ||
19 | maintainer-clean dist-clean distclean pristine sanity: veryclean | ||
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch b/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch new file mode 100644 index 0000000000..894a697661 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | --- | ||
2 | buildlib/sizetable | 4 +++- | ||
3 | configure.in | 2 +- | ||
4 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
5 | |||
6 | --- apt-0.7.14.orig/buildlib/sizetable | ||
7 | +++ apt-0.7.14/buildlib/sizetable | ||
8 | @@ -9,16 +9,19 @@ | ||
9 | # | ||
10 | # This is used primarily for the MD5 algorithm. | ||
11 | # The format is:- | ||
12 | # CPU endian sizeof: char, int, short, long | ||
13 | i386 little 1 4 2 4 | ||
14 | +i486 little 1 4 2 4 | ||
15 | +i586 little 1 4 2 4 | ||
16 | +i686 little 1 4 2 4 | ||
17 | armeb big 1 4 2 4 | ||
18 | arm little 1 4 2 4 | ||
19 | alpha little 1 4 2 8 | ||
20 | mipsel little 1 4 2 4 | ||
21 | sparc big 1 4 2 4 | ||
22 | sparc64 big 1 4 2 8 | ||
23 | m68k big 1 4 2 4 | ||
24 | powerpc big 1 4 2 4 | ||
25 | mips big 1 4 2 4 | ||
26 | hppa big 1 4 2 4 | ||
27 | -m32r big 1 4 2 4 | ||
28 | \ No newline at end of file | ||
29 | +m32r big 1 4 2 4 | ||
30 | --- apt-0.7.14.orig/configure.in | ||
31 | +++ apt-0.7.14/configure.in | ||
32 | @@ -86,11 +86,11 @@ AC_SUBST(BDBLIB) | ||
33 | dnl Converts the ARCH to be something singular for this general CPU family | ||
34 | dnl This is often the dpkg architecture string. | ||
35 | dnl First check against the full canonical canoncial-system-type in $target | ||
36 | dnl and if that fails, just look for the cpu | ||
37 | AC_MSG_CHECKING(debian architecture) | ||
38 | -archset="`dpkg-architecture -qDEB_HOST_ARCH`" | ||
39 | +archset="`echo $host_alias|cut -d'-' -f1`" | ||
40 | if test "x$archset" = "x"; then | ||
41 | AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) | ||
42 | fi | ||
43 | AC_MSG_RESULT($archset) | ||
44 | AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") | ||
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc new file mode 100644 index 0000000000..b16f99e93c --- /dev/null +++ b/meta/recipes-devtools/apt/apt-native.inc | |||
@@ -0,0 +1,63 @@ | |||
1 | require apt.inc | ||
2 | inherit native | ||
3 | |||
4 | DEPENDS += "dpkg-native gettext-native" | ||
5 | PACKAGES = "" | ||
6 | USE_NLS = "yes" | ||
7 | |||
8 | SRC_URI += "file://db_linking_hack.patch" | ||
9 | |||
10 | python do_install () { | ||
11 | bb.build.exec_func('do_install_base', d) | ||
12 | bb.build.exec_func('do_install_config', d) | ||
13 | } | ||
14 | |||
15 | python do_install_config () { | ||
16 | indir = os.path.dirname(bb.data.getVar('FILE',d,1)) | ||
17 | infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r') | ||
18 | data = infile.read() | ||
19 | infile.close() | ||
20 | |||
21 | data = bb.data.expand(data, d) | ||
22 | |||
23 | outdir = os.path.join(bb.data.getVar('D', d, 1), bb.data.getVar('sysconfdir', d, 1), 'apt') | ||
24 | if not os.path.exists(outdir): | ||
25 | os.makedirs(outdir) | ||
26 | outpath = os.path.join(outdir, 'apt.conf.sample') | ||
27 | |||
28 | outfile = file(outpath, 'w') | ||
29 | outfile.write(data) | ||
30 | outfile.close() | ||
31 | } | ||
32 | |||
33 | do_install_base () { | ||
34 | install -d ${D}${bindir} | ||
35 | install -m 0755 bin/apt-cdrom ${D}${bindir}/ | ||
36 | install -m 0755 bin/apt-get ${D}${bindir}/ | ||
37 | install -m 0755 bin/apt-config ${D}${bindir}/ | ||
38 | install -m 0755 bin/apt-cache ${D}${bindir}/ | ||
39 | install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ | ||
40 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ | ||
41 | |||
42 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` | ||
43 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ | ||
44 | ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so | ||
45 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ | ||
46 | ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so | ||
47 | |||
48 | install -d ${D}${libdir}/apt/methods | ||
49 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ | ||
50 | |||
51 | install -d ${D}${libdir}/dpkg/methods/apt | ||
52 | install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ | ||
53 | install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ | ||
54 | install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ | ||
55 | install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ | ||
56 | install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ | ||
57 | |||
58 | install -d ${D}${sysconfdir}/apt | ||
59 | install -d ${D}${localstatedir}/lib/apt/lists/partial | ||
60 | install -d ${D}${localstatedir}/cache/apt/archives/partial | ||
61 | |||
62 | install -d ${D}${localstatedir}/log/apt/ | ||
63 | } | ||
diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb new file mode 100644 index 0000000000..2f04b72cab --- /dev/null +++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require apt-native.inc | ||
2 | |||
3 | PR = "r3" | ||
4 | |||
5 | SRC_URI += "file://nodoc.patch \ | ||
6 | file://noconfigure.patch \ | ||
7 | file://no-curl.patch \ | ||
8 | file://includes-fix.patch" | ||
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc new file mode 100644 index 0000000000..9e104f12ed --- /dev/null +++ b/meta/recipes-devtools/apt/apt-package.inc | |||
@@ -0,0 +1,104 @@ | |||
1 | apt-manpages="doc/apt-cache.8 \ | ||
2 | doc/apt-cdrom.8 \ | ||
3 | doc/apt-config.8 \ | ||
4 | doc/apt-get.8 \ | ||
5 | doc/apt.8 \ | ||
6 | doc/apt.conf.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" | ||
29 | apt-utils-manpages="doc/apt-extracttemplates.1 \ | ||
30 | 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 | |||
36 | def get_files_apt_doc(d, bb, manpages): | ||
37 | import re | ||
38 | manpages = re.sub(r'\bdoc/(\S+)/(\S+)\.\1\.(.)\b', r'${mandir}/\1/man\3/\2.\3', manpages) | ||
39 | manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\2/\1.\2', manpages) | ||
40 | return manpages | ||
41 | |||
42 | def get_commands_apt_doc(d, bb, manpages): | ||
43 | import os | ||
44 | s = list() | ||
45 | __dir_cache__ = list() | ||
46 | for m in manpages.split(): | ||
47 | dest = get_files_apt_doc(d, bb, m) | ||
48 | dir = os.path.dirname(dest) | ||
49 | if not dir in __dir_cache__: | ||
50 | s.append("install -d ${D}/%s" % dir) | ||
51 | __dir_cache__.append(dir) | ||
52 | s.append("install -m 0644 %s ${D}/%s" % (m, dest)) | ||
53 | return "\n".join(s) | ||
54 | |||
55 | PACKAGES += "${PN}-utils ${PN}-utils-doc" | ||
56 | FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \ | ||
57 | ${bindir}/apt-config ${bindir}/apt-cache \ | ||
58 | ${libdir}/apt ${libdir}/libapt*.so.* \ | ||
59 | ${localstatedir} ${sysconfdir} \ | ||
60 | ${libdir}/dpkg" | ||
61 | FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" | ||
62 | FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \ | ||
63 | ${docdir}/apt" | ||
64 | FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}" | ||
65 | FILES_${PN}-dev = "${libdir}/libapt*.so" | ||
66 | |||
67 | do_install () { | ||
68 | set -x | ||
69 | ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} | ||
70 | ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))} | ||
71 | install -d ${D}${bindir} | ||
72 | install -m 0755 bin/apt-cdrom ${D}${bindir}/ | ||
73 | install -m 0755 bin/apt-get ${D}${bindir}/ | ||
74 | install -m 0755 bin/apt-config ${D}${bindir}/ | ||
75 | install -m 0755 bin/apt-cache ${D}${bindir}/ | ||
76 | |||
77 | install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ | ||
78 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ | ||
79 | |||
80 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` | ||
81 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ | ||
82 | ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so | ||
83 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ | ||
84 | ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so | ||
85 | |||
86 | install -d ${D}${libdir}/apt/methods | ||
87 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ | ||
88 | |||
89 | install -d ${D}${libdir}/dpkg/methods/apt | ||
90 | install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ | ||
91 | install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ | ||
92 | install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ | ||
93 | install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ | ||
94 | install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ | ||
95 | |||
96 | install -d ${D}${sysconfdir}/apt | ||
97 | install -d ${D}${localstatedir}/lib/apt/lists/partial | ||
98 | install -d ${D}${localstatedir}/cache/apt/archives/partial | ||
99 | install -d ${D}${docdir}/apt/examples | ||
100 | install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/ | ||
101 | |||
102 | install -d ${D}${includedir}/apt-pkg/ | ||
103 | install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ | ||
104 | } | ||
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc new file mode 100644 index 0000000000..546683f9bc --- /dev/null +++ b/meta/recipes-devtools/apt/apt.inc | |||
@@ -0,0 +1,26 @@ | |||
1 | DESCRIPTION = "Advanced front-end for dpkg." | ||
2 | LICENSE = "GPL" | ||
3 | SECTION = "base" | ||
4 | |||
5 | SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ | ||
6 | file://no-ko-translation.patch \ | ||
7 | file://use-host.patch \ | ||
8 | " | ||
9 | |||
10 | inherit autotools gettext | ||
11 | |||
12 | EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" | ||
13 | |||
14 | # Apt wants to know the glibc version by running a binary file, which will | ||
15 | # fail, so we have to tell configure which version to use Since I don't know | ||
16 | # the impliations of setting a wrong value I only provide one for angstrom, | ||
17 | # which uses glibc 2.5 (which claims to be 2.4) | ||
18 | # Koen - 20070327 | ||
19 | EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4" | ||
20 | |||
21 | # under Debian it is set to libc6.3 as they use glibc 2.3 | ||
22 | # They also provide glibc 2.5 in 'experimental' and it works with APT built | ||
23 | # for 2.3 so we set it in same way | ||
24 | EXTRA_OECONF_append = " ac_cv_glibc_ver=libc6.3" | ||
25 | |||
26 | FILES_${PN}-dbg += "${libdir}/apt/methods/.debug/" | ||
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb new file mode 100644 index 0000000000..0ea9b48142 --- /dev/null +++ b/meta/recipes-devtools/apt/apt_0.7.14.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | DEPENDS = "curl db" | ||
2 | RDEPENDS = "dpkg" | ||
3 | |||
4 | require apt.inc | ||
5 | |||
6 | PR = "r3" | ||
7 | |||
8 | SRC_URI += "file://nodoc.patch \ | ||
9 | file://includes-fix.patch" | ||
10 | |||
11 | require apt-package.inc | ||
12 | |||
13 | FILES_${PN} += "${bindir}/apt-key" | ||
14 | apt-manpages += "doc/apt-key.8" | ||
15 | |||
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf new file mode 100644 index 0000000000..2bd9ddbfaf --- /dev/null +++ b/meta/recipes-devtools/apt/files/apt.conf | |||
@@ -0,0 +1,43 @@ | |||
1 | Dir "${STAGING_DIR_NATIVE}/" | ||
2 | { | ||
3 | State "var/lib/apt/" | ||
4 | { | ||
5 | Lists "lists/"; | ||
6 | status "${IMAGE_ROOTFS}/var/dpkg/status"; | ||
7 | }; | ||
8 | Cache "var/cache/apt/" | ||
9 | { | ||
10 | Archives "archives/"; | ||
11 | pkgcache ""; | ||
12 | srcpkgcache ""; | ||
13 | }; | ||
14 | Bin "${STAGING_BINDIR_NATIVE}/" | ||
15 | { | ||
16 | methods "${STAGING_LIBDIR}/apt/methods/"; | ||
17 | gzip "/bin/gzip"; | ||
18 | dpkg "dpkg"; | ||
19 | dpkg-source "dpkg-source"; | ||
20 | dpkg-buildpackage "dpkg-buildpackage"; | ||
21 | apt-get "apt-get"; | ||
22 | apt-cache "apt-cache"; | ||
23 | }; | ||
24 | Etc "etc/apt/" | ||
25 | { | ||
26 | Preferences "preferences"; | ||
27 | }; | ||
28 | }; | ||
29 | |||
30 | APT | ||
31 | { | ||
32 | Install-Recommends "true"; | ||
33 | Immediate-Configure "false"; | ||
34 | Architecture "i586"; | ||
35 | Get | ||
36 | { | ||
37 | Assume-Yes "true"; | ||
38 | Force-Yes "true" | ||
39 | }; | ||
40 | }; | ||
41 | |||
42 | DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"}; | ||
43 | }; | ||
diff --git a/meta/recipes-devtools/apt/files/db_linking_hack.patch b/meta/recipes-devtools/apt/files/db_linking_hack.patch new file mode 100644 index 0000000000..3c8368b1ed --- /dev/null +++ b/meta/recipes-devtools/apt/files/db_linking_hack.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Index: apt-0.7.3/configure.in | ||
2 | =================================================================== | ||
3 | --- apt-0.7.3.orig/configure.in 2007-07-01 10:38:45.000000000 +0000 | ||
4 | +++ apt-0.7.3/configure.in 2007-08-21 13:39:26.000000000 +0000 | ||
5 | @@ -67,8 +67,20 @@ | ||
6 | [AC_DEFINE(HAVE_BDB) | ||
7 | BDBLIB="-ldb" | ||
8 | AC_MSG_RESULT(yes)], | ||
9 | - [BDBLIB="" | ||
10 | - AC_MSG_RESULT(no)] | ||
11 | + | ||
12 | + LIBS="$LIBS -lpthread" | ||
13 | + [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread) | ||
14 | + AC_LINK_IFELSE( | ||
15 | + [AC_LANG_PROGRAM( | ||
16 | + [#include <db.h>], | ||
17 | + [int r, s, t; db_version(&r, &s, &t);] | ||
18 | + )], | ||
19 | + [AC_DEFINE(HAVE_BDB) | ||
20 | + BDBLIB="-ldb -lpthread" | ||
21 | + AC_MSG_RESULT(yes)], | ||
22 | + [BDBLIB="" | ||
23 | + AC_MSG_RESULT(no)] | ||
24 | + )] | ||
25 | )] | ||
26 | ) | ||
27 | |||
diff --git a/meta/recipes-devtools/apt/files/environment.patch b/meta/recipes-devtools/apt/files/environment.patch new file mode 100644 index 0000000000..5bea1a0130 --- /dev/null +++ b/meta/recipes-devtools/apt/files/environment.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: apt-0.6.46.2/buildlib/environment.mak.in | ||
2 | =================================================================== | ||
3 | --- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 | ||
4 | +++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 | ||
5 | @@ -62,7 +62,7 @@ | ||
6 | |||
7 | # Shared library things | ||
8 | HOST_OS = @host_os@ | ||
9 | -ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) | ||
10 | +ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) | ||
11 | SONAME_MAGIC=-Wl,-soname -Wl, | ||
12 | LFLAGS_SO= | ||
13 | else | ||
diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch new file mode 100644 index 0000000000..4e07c8f2dc --- /dev/null +++ b/meta/recipes-devtools/apt/files/no-curl.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | --- | ||
2 | configure.in | 6 ------ | ||
3 | methods/makefile | 7 ------- | ||
4 | 2 files changed, 13 deletions(-) | ||
5 | |||
6 | --- apt-0.7.14.orig/configure.in | ||
7 | +++ apt-0.7.14/configure.in | ||
8 | @@ -84,16 +84,10 @@ AC_CHECK_HEADER(db.h, | ||
9 | )] | ||
10 | ) | ||
11 | |||
12 | LIBS="$saveLIBS" | ||
13 | |||
14 | -AC_CHECK_LIB(curl, curl_easy_init, | ||
15 | - [AC_CHECK_HEADER(curl/curl.h, | ||
16 | - curl_ok=yes, | ||
17 | - curl_ok=no)], | ||
18 | - AC_MSG_ERROR([failed: I need CURL due https support]), | ||
19 | -) | ||
20 | |||
21 | AC_SUBST(BDBLIB) | ||
22 | |||
23 | dnl Converts the ARCH to be something singular for this general CPU family | ||
24 | dnl This is often the dpkg architecture string. | ||
25 | --- apt-0.7.14.orig/methods/makefile | ||
26 | +++ apt-0.7.14/methods/makefile | ||
27 | @@ -50,17 +50,10 @@ PROGRAM=http | ||
28 | SLIBS = -lapt-pkg $(SOCKETLIBS) | ||
29 | LIB_MAKES = apt-pkg/makefile | ||
30 | SOURCE = http.cc rfc2553emu.cc connect.cc | ||
31 | include $(PROGRAM_H) | ||
32 | |||
33 | -# The https method | ||
34 | -PROGRAM=https | ||
35 | -SLIBS = -lapt-pkg -lcurl | ||
36 | -LIB_MAKES = apt-pkg/makefile | ||
37 | -SOURCE = https.cc | ||
38 | -include $(PROGRAM_H) | ||
39 | - | ||
40 | # The ftp method | ||
41 | PROGRAM=ftp | ||
42 | SLIBS = -lapt-pkg $(SOCKETLIBS) | ||
43 | LIB_MAKES = apt-pkg/makefile | ||
44 | SOURCE = ftp.cc rfc2553emu.cc connect.cc | ||