diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/apt/apt-0.7.14 | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-0.7.14')
5 files changed, 149 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") | ||