summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-03-01 17:06:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:54 +0000
commit9199c3391380f9ac56a33409c25194486062d7d4 (patch)
treef9331ca0f403b90bff695433058c3346df888324 /meta
parent7e2e2cf50855cd3f3546f0ec33d88075156011a0 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch75
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch44
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch91
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch11
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch37
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch21
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch63
-rw-r--r--meta/recipes-devtools/apt/apt-0.7.14/use-host.patch42
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/disable-configure-in-makefile.patch18
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch10
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/makerace.patch (renamed from meta/recipes-devtools/apt/apt-0.7.14/makerace.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/no-ko-translation.patch11
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch24
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/noconfigure.patch36
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/nodoc.patch18
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/truncate-filename.patch (renamed from meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.7.7/use-host.patch13
-rw-r--r--meta/recipes-devtools/apt/apt-native.inc2
-rw-r--r--meta/recipes-devtools/apt/apt-native_0.7.14.bb13
-rw-r--r--meta/recipes-devtools/apt/apt-native_0.9.7.7.bb11
-rw-r--r--meta/recipes-devtools/apt/apt-package.inc39
-rw-r--r--meta/recipes-devtools/apt/apt.inc12
-rw-r--r--meta/recipes-devtools/apt/apt_0.9.7.7.bb (renamed from meta/recipes-devtools/apt/apt_0.7.14.bb)8
-rw-r--r--meta/recipes-devtools/apt/files/no-curl.patch26
24 files changed, 170 insertions, 455 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch b/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
deleted file mode 100644
index 36e1499005..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1Method file has died unexpectedly
2
3"Method file has died unexpectedly!", this is because the "char S[1024]"
4is not enough for the long the URI, "char S[2048]" would be enough.
5
6It would be boring if we use malloc here since we can't know how much
7memory is needed except strelen() every component of it. So similarly
8use "char S[2048]" as it did before.
9
10Upstream-Status: Pending
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 apt-pkg/acquire-method.cc | 12 ++++++------
14 1 file changed, 6 insertions(+), 6 deletions(-)
15
16diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
17--- a/apt-pkg/acquire-method.cc
18+++ b/apt-pkg/acquire-method.cc
19@@ -95,7 +95,7 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
20 *I = ' ';
21 }
22
23- char S[1024];
24+ char S[2048];
25 if (Queue != 0)
26 {
27 snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n"
28@@ -132,7 +132,7 @@ void pkgAcqMethod::URIStart(FetchResult &Res)
29 if (Queue == 0)
30 abort();
31
32- char S[1024] = "";
33+ char S[2048] = "";
34 char *End = S;
35
36 End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str());
37@@ -160,7 +160,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
38 if (Queue == 0)
39 abort();
40
41- char S[1024] = "";
42+ char S[2048] = "";
43 char *End = S;
44
45 End += snprintf(S,sizeof(S),"201 URI Done\nURI: %s\n",Queue->Uri.c_str());
46@@ -242,7 +242,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
47 to be ackd */
48 bool pkgAcqMethod::MediaFail(string Required,string Drive)
49 {
50- char S[1024];
51+ char S[2048];
52 snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n",
53 Required.c_str(),Drive.c_str());
54
55@@ -411,7 +411,7 @@ void pkgAcqMethod::Log(const char *Format,...)
56 va_start(args,Format);
57
58 // sprintf the description
59- char S[1024];
60+ char S[2048];
61 unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\nURI: %s\n"
62 "Message: ",CurrentURI.c_str());
63
64@@ -435,7 +435,7 @@ void pkgAcqMethod::Status(const char *Format,...)
65 va_start(args,Format);
66
67 // sprintf the description
68- char S[1024];
69+ char S[2048];
70 unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\nURI: %s\n"
71 "Message: ",CurrentURI.c_str());
72
73--
741.7.10.4
75
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
deleted file mode 100644
index c85c3881aa..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Upstream-Status: Backport
2
3Add missing includes required when building with modern toolchain, based on
4patch from Debian bugzilla:
5http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505954
6
7Should no longer be required once upgraded to 0.7.22 or later.
8
9Index: apt-0.7.14/apt-pkg/acquire.cc
10===================================================================
11--- apt-0.7.14.orig/apt-pkg/acquire.cc 2008-05-28 14:22:13.000000000 +0100
12+++ apt-0.7.14/apt-pkg/acquire.cc 2010-07-23 17:30:11.494883936 +0100
13@@ -22,6 +22,7 @@
14
15 #include <apti18n.h>
16
17+#include <cstdio>
18 #include <iostream>
19 #include <sstream>
20
21Index: apt-0.7.14/apt-pkg/contrib/sha256.h
22===================================================================
23--- apt-0.7.14.orig/apt-pkg/contrib/sha256.h 2008-05-28 14:22:14.000000000 +0100
24+++ apt-0.7.14/apt-pkg/contrib/sha256.h 2010-07-23 17:30:11.494883936 +0100
25@@ -14,6 +14,7 @@
26 #ifndef APTPKG_SHA256_H
27 #define APTPKG_SHA256_H
28
29+#include <stdint.h>
30 #include <string>
31 #include <cstring>
32 #include <algorithm>
33Index: apt-0.7.14/apt-pkg/deb/dpkgpm.cc
34===================================================================
35--- apt-0.7.14.orig/apt-pkg/deb/dpkgpm.cc 2008-05-28 14:22:14.000000000 +0100
36+++ apt-0.7.14/apt-pkg/deb/dpkgpm.cc 2010-07-23 17:30:36.960856870 +0100
37@@ -20,6 +20,7 @@
38 #include <stdlib.h>
39 #include <fcntl.h>
40 #include <sys/select.h>
41+#include <sys/stat.h>
42 #include <sys/types.h>
43 #include <sys/wait.h>
44 #include <signal.h>
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch b/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch
deleted file mode 100644
index 80252732e2..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch
+++ /dev/null
@@ -1,91 +0,0 @@
1Add in missing header includes to resolve compile failures with recent
2compiler/glibc combinations.
3
4Upstream-Status: Inappropriate [Resolved upstream]
5
6RP 2011/11/23
7
8Index: apt-0.7.14/apt-pkg/init.cc
9===================================================================
10--- apt-0.7.14.orig/apt-pkg/init.cc 2011-11-23 22:48:53.544637868 +0000
11+++ apt-0.7.14/apt-pkg/init.cc 2011-11-23 22:48:59.456638260 +0000
12@@ -16,6 +16,7 @@
13 #include <config.h>
14 #include <cstdlib>
15 #include <sys/stat.h>
16+#include <locale>
17 /*}}}*/
18
19 #define Stringfy_(x) # x
20Index: apt-0.7.14/cmdline/apt-cache.cc
21===================================================================
22--- apt-0.7.14.orig/cmdline/apt-cache.cc 2011-11-23 22:53:29.048631067 +0000
23+++ apt-0.7.14/cmdline/apt-cache.cc 2011-11-23 22:54:15.784616212 +0000
24@@ -32,6 +32,7 @@
25 #include <apti18n.h>
26
27 #include <locale.h>
28+#include <locale>
29 #include <iostream>
30 #include <unistd.h>
31 #include <errno.h>
32Index: apt-0.7.14/cmdline/apt-cdrom.cc
33===================================================================
34--- apt-0.7.14.orig/cmdline/apt-cdrom.cc 2011-11-23 22:53:29.064631096 +0000
35+++ apt-0.7.14/cmdline/apt-cdrom.cc 2011-11-23 22:53:57.616630261 +0000
36@@ -27,6 +27,7 @@
37 //#include "indexcopy.h"
38
39 #include <locale.h>
40+#include <locale>
41 #include <iostream>
42 #include <fstream>
43 #include <vector>
44Index: apt-0.7.14/cmdline/apt-config.cc
45===================================================================
46--- apt-0.7.14.orig/cmdline/apt-config.cc 2011-11-23 22:50:16.796635352 +0000
47+++ apt-0.7.14/cmdline/apt-config.cc 2011-11-23 22:50:25.640633906 +0000
48@@ -27,6 +27,7 @@
49 #include <locale.h>
50 #include <iostream>
51 #include <string>
52+#include <locale>
53 /*}}}*/
54 using namespace std;
55
56Index: apt-0.7.14/cmdline/apt-extracttemplates.cc
57===================================================================
58--- apt-0.7.14.orig/cmdline/apt-extracttemplates.cc 2011-11-23 22:53:29.080631084 +0000
59+++ apt-0.7.14/cmdline/apt-extracttemplates.cc 2011-11-23 22:53:38.304630439 +0000
60@@ -39,6 +39,7 @@
61 #include <config.h>
62 #include <apti18n.h>
63 #include "apt-extracttemplates.h"
64+#include <locale>
65 /*}}}*/
66
67 using namespace std;
68Index: apt-0.7.14/cmdline/apt-get.cc
69===================================================================
70--- apt-0.7.14.orig/cmdline/apt-get.cc 2011-11-23 22:53:29.096631090 +0000
71+++ apt-0.7.14/cmdline/apt-get.cc 2011-11-23 22:53:49.368629452 +0000
72@@ -48,6 +48,7 @@
73
74 #include <set>
75 #include <locale.h>
76+#include <locale>
77 #include <langinfo.h>
78 #include <fstream>
79 #include <termios.h>
80Index: apt-0.7.14/cmdline/apt-sortpkgs.cc
81===================================================================
82--- apt-0.7.14.orig/cmdline/apt-sortpkgs.cc 2011-11-23 22:52:03.872640247 +0000
83+++ apt-0.7.14/cmdline/apt-sortpkgs.cc 2011-11-23 22:52:10.880638611 +0000
84@@ -27,6 +27,7 @@
85
86 #include <locale.h>
87 #include <unistd.h>
88+#include <locale>
89 /*}}}*/
90
91 using namespace std;
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
deleted file mode 100644
index 7fd1db8b25..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 po/LINGUAS | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-)
6
7--- apt-0.7.14.orig/po/LINGUAS
8+++ apt-0.7.14/po/LINGUAS
9@@ -1 +1 @@
10-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
11+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
deleted file mode 100644
index 04e721d659..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 apt-pkg/packagemanager.cc | 4 ++++
5 1 file changed, 4 insertions(+)
6
7--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc
8+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc
9@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI
10
11 List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
12
13+#if 0
14 // Perform immedate configuration of the package.
15 if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
16 if (SmartConfigure(Pkg) == false)
17 return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
18+#endif
19
20 return true;
21 }
22@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag
23 DoneSomething = true;
24 }
25
26+#if 0
27 // Final run through the configure phase
28 if (ConfigureAll() == false)
29 return Failed;
30@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag
31 return Failed;
32 }
33 }
34+#endif
35
36 return Completed;
37 }
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch b/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch
deleted file mode 100644
index 216c091819..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 Makefile | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-)
6
7--- apt-0.7.14.orig/Makefile
8+++ apt-0.7.14/Makefile
9@@ -15,11 +15,11 @@ all headers library clean veryclean bina
10 $(MAKE) -C apt-inst $@
11 $(MAKE) -C methods $@
12 $(MAKE) -C cmdline $@
13 $(MAKE) -C ftparchive $@
14 $(MAKE) -C dselect $@
15- $(MAKE) -C doc $@
16+# $(MAKE) -C doc $@
17 $(MAKE) -C po $@
18
19 # Some very common aliases
20 .PHONY: maintainer-clean dist-clean distclean pristine sanity
21 maintainer-clean dist-clean distclean pristine sanity: veryclean
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch b/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch
deleted file mode 100644
index 8d7c891545..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Fix build errors on gcc 4.7:
2
3deb/deblistparser.cc: In member function 'virtual short unsigned int debListParser::VersionHash()':
4deb/deblistparser.cc:212:13: error: redeclaration of 'char* I'
5deb/deblistparser.cc:202:22: error: 'const char** I' previously declared here
6
7Upstream-Status: Backport
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9---
10 apt-pkg/deb/deblistparser.cc | 10 +++++-----
11 cmdline/apt-get.cc | 8 ++++----
12 2 files changed, 9 insertions(+), 9 deletions(-)
13
14diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
15--- a/apt-pkg/deb/deblistparser.cc
16+++ b/apt-pkg/deb/deblistparser.cc
17@@ -209,18 +209,18 @@ unsigned short debListParser::VersionHash()
18 /* Strip out any spaces from the text, this undoes dpkgs reformatting
19 of certain fields. dpkg also has the rather interesting notion of
20 reformatting depends operators < -> <= */
21- char *I = S;
22+ char *J = S;
23 for (; Start != End; Start++)
24 {
25 if (isspace(*Start) == 0)
26- *I++ = tolower(*Start);
27+ *J++ = tolower(*Start);
28 if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
29- *I++ = '=';
30+ *J++ = '=';
31 if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
32- *I++ = '=';
33+ *J++ = '=';
34 }
35
36- Result = AddCRC16(Result,S,I - S);
37+ Result = AddCRC16(Result,S,J - S);
38 }
39
40 return Result;
41diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
42--- a/cmdline/apt-get.cc
43+++ b/cmdline/apt-get.cc
44@@ -1752,12 +1752,12 @@ bool DoInstall(CommandLine &CmdL)
45 if ((*Cache)[I].Install() == false)
46 continue;
47
48- const char **J;
49- for (J = CmdL.FileList + 1; *J != 0; J++)
50- if (strcmp(*J,I.Name()) == 0)
51+ const char **K;
52+ for (K = CmdL.FileList + 1; *K != 0; K++)
53+ if (strcmp(*K,I.Name()) == 0)
54 break;
55
56- if (*J == 0) {
57+ if (*K == 0) {
58 List += string(I.Name()) + " ";
59 VersionsList += string(Cache[I].CandVersion) + "\n";
60 }
61--
621.7.1
63
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
deleted file mode 100644
index 485ad7ba37..0000000000
--- a/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 buildlib/sizetable | 4 +++-
5 configure.in | 2 +-
6 2 files changed, 4 insertions(+), 2 deletions(-)
7
8Index: apt-0.7.14/buildlib/sizetable
9===================================================================
10--- apt-0.7.14.orig/buildlib/sizetable
11+++ apt-0.7.14/buildlib/sizetable
12@@ -11,6 +11,9 @@
13 # The format is:-
14 # CPU endian sizeof: char, int, short, long
15 i386 little 1 4 2 4
16+i486 little 1 4 2 4
17+i586 little 1 4 2 4
18+i686 little 1 4 2 4
19 armeb big 1 4 2 4
20 arm little 1 4 2 4
21 alpha little 1 4 2 8
22@@ -21,4 +24,5 @@ m68k big 1 4 2 4
23 powerpc big 1 4 2 4
24 mips big 1 4 2 4
25 hppa big 1 4 2 4
26-m32r big 1 4 2 4
27\ No newline at end of file
28+m32r big 1 4 2 4
29+x86_64 little 1 4 2 8
30Index: apt-0.7.14/configure.in
31===================================================================
32--- apt-0.7.14.orig/configure.in
33+++ apt-0.7.14/configure.in
34@@ -88,7 +88,7 @@ dnl This is often the dpkg architecture
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
diff --git a/meta/recipes-devtools/apt/apt-0.9.7.7/disable-configure-in-makefile.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/disable-configure-in-makefile.patch
new file mode 100644
index 0000000000..7c2f64e3e6
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/disable-configure-in-makefile.patch
@@ -0,0 +1,18 @@
1Disable configure at compilation stage
2
3Upstream-Status: Inappropriate [configuration]
4Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
5
6Index: apt-0.9.7.7/Makefile
7===================================================================
8--- apt-0.9.7.7.orig/Makefile
9+++ apt-0.9.7.7/Makefile
10@@ -33,7 +33,7 @@ veryclean: clean
11 # The startup target builds the necessary configure scripts. It should
12 # be used after a CVS checkout.
13 CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile
14-include buildlib/configure.mak
15+#include buildlib/configure.mak
16 $(BUILDDIR)/include/config.h: buildlib/config.h.in
17 $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in
18 $(BUILDDIR)/environment.mak: buildlib/environment.mak.in
diff --git a/meta/recipes-devtools/apt/apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch
new file mode 100644
index 0000000000..70ecd95096
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch
@@ -0,0 +1,10 @@
1--- a/apt-pkg/contrib/weakptr.h
2+++ b/apt-pkg/contrib/weakptr.h
3@@ -21,6 +21,7 @@
4 #ifndef WEAK_POINTER_H
5 #define WEAK_POINTER_H
6
7+#include <cstdlib>
8 #include <set>
9 /**
10 * Class for objects providing support for weak pointers.
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/makerace.patch
index 403711f013..403711f013 100644
--- a/meta/recipes-devtools/apt/apt-0.7.14/makerace.patch
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/makerace.patch
diff --git a/meta/recipes-devtools/apt/apt-0.9.7.7/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/no-ko-translation.patch
new file mode 100644
index 0000000000..7aa408f19e
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/no-ko-translation.patch
@@ -0,0 +1,11 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 po/LINGUAS | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-)
6
7--- a/po/LINGUAS
8+++ b/po/LINGUAS
9@@ -1 +1 @@
10-ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW
11+ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ku lt 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.9.7.7/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch
new file mode 100644
index 0000000000..f1dd5fd05b
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch
@@ -0,0 +1,24 @@
1--- a/apt-pkg/deb/dpkgpm.cc
2+++ b/apt-pkg/deb/dpkgpm.cc
3@@ -42,6 +42,12 @@
4 #include <apti18n.h>
5 /*}}}*/
6
7+#ifdef USE_NLS
8+#define _dpkg(x) dgettext("dpkg", x)
9+#else
10+#define _dpkg(x) x
11+#endif
12+
13 using namespace std;
14
15 namespace
16@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const
17 }
18
19 // check if its not a follow up error
20- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured");
21+ const char *needle = _dpkg("dependency problems - leaving unconfigured");
22 if(strstr(errormsg, needle) != NULL) {
23 std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl;
24 return;
diff --git a/meta/recipes-devtools/apt/apt-0.9.7.7/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/noconfigure.patch
new file mode 100644
index 0000000000..712d5e7296
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/noconfigure.patch
@@ -0,0 +1,36 @@
1Upstream-Status: Inappropriate [configuration]
2Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
3
4Index: apt-0.9.7.7/apt-pkg/packagemanager.cc
5===================================================================
6--- apt-0.9.7.7.orig/apt-pkg/packagemanager.cc
7+++ apt-0.9.7.7/apt-pkg/packagemanager.cc
8@@ -893,10 +893,12 @@ bool pkgPackageManager::SmartUnPack(PkgI
9 return false;
10
11 if (Immediate == true) {
12+#if 0
13 // Perform immedate configuration of the package.
14 if (SmartConfigure(Pkg, Depth + 1) == false)
15 _error->Warning(_("Could not perform immediate configuration on '%s'. "
16 "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);
17+#endif
18 }
19
20 return true;
21@@ -986,6 +988,7 @@ pkgPackageManager::OrderResult pkgPackag
22 }
23 }
24
25+#if 0
26 // Final run through the configure phase
27 if (ConfigureAll() == false)
28 return Failed;
29@@ -1000,6 +1003,7 @@ pkgPackageManager::OrderResult pkgPackag
30 return Failed;
31 }
32 }
33+#endif
34
35 return Completed;
36 }
diff --git a/meta/recipes-devtools/apt/apt-0.9.7.7/nodoc.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/nodoc.patch
new file mode 100644
index 0000000000..449e42df4a
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/nodoc.patch
@@ -0,0 +1,18 @@
1Disable documentation
2
3Upstream-Status: Inappropriate [configuration]
4Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
5
6Index: apt-0.9.7.7/Makefile
7===================================================================
8--- apt-0.9.7.7.orig/Makefile
9+++ apt-0.9.7.7/Makefile
10@@ -17,7 +17,7 @@ all headers library clean veryclean bina
11 $(MAKE) -C cmdline $@
12 $(MAKE) -C ftparchive $@
13 $(MAKE) -C dselect $@
14- $(MAKE) -C doc $@
15+# $(MAKE) -C doc $@
16 $(MAKE) -C po $@
17 $(MAKE) -C test $@
18
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/truncate-filename.patch
index db1c42b66c..db1c42b66c 100644
--- a/meta/recipes-devtools/apt/apt-0.7.14/truncate-filename.patch
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/truncate-filename.patch
diff --git a/meta/recipes-devtools/apt/apt-0.9.7.7/use-host.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/use-host.patch
new file mode 100644
index 0000000000..f7eaaedf8d
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.7.7/use-host.patch
@@ -0,0 +1,13 @@
1Index: apt-0.9.7.7/configure.in
2===================================================================
3--- apt-0.9.7.7.orig/configure.in
4+++ apt-0.9.7.7/configure.in
5@@ -112,7 +112,7 @@ dnl This is often the dpkg architecture
6 dnl First check against the full canonical canoncial-system-type in $target
7 dnl and if that fails, just look for the cpu
8 AC_MSG_CHECKING(debian architecture)
9-archset="`dpkg-architecture -qDEB_HOST_ARCH`"
10+archset="`echo $host_alias|cut -d'-' -f1`"
11 if test "x$archset" = "x"; then
12 AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture])
13 fi
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index c7e7e420ba..a29e98633d 100644
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
@@ -58,6 +58,8 @@ do_install_base () {
58 install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 58 install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/
59 59
60 install -d ${D}${sysconfdir}/apt 60 install -d ${D}${sysconfdir}/apt
61 install -d ${D}${sysconfdir}/apt/apt.conf.d
62 install -d ${D}${sysconfdir}/apt/preferences.d
61 install -d ${D}${localstatedir}/lib/apt/lists/partial 63 install -d ${D}${localstatedir}/lib/apt/lists/partial
62 install -d ${D}${localstatedir}/cache/apt/archives/partial 64 install -d ${D}${localstatedir}/cache/apt/archives/partial
63 65
diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
deleted file mode 100644
index d4513cae72..0000000000
--- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require apt-native.inc
2
3PR = "r11"
4
5SRC_URI += "file://nodoc.patch \
6 file://noconfigure.patch \
7 file://no-curl.patch \
8 file://includes-fix.patch"
9
10SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814"
11SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045"
12
13LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
diff --git a/meta/recipes-devtools/apt/apt-native_0.9.7.7.bb b/meta/recipes-devtools/apt/apt-native_0.9.7.7.bb
new file mode 100644
index 0000000000..1e420a4d33
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-native_0.9.7.7.bb
@@ -0,0 +1,11 @@
1require apt-native.inc
2
3PR = "r0"
4
5SRC_URI += "file://noconfigure.patch \
6 file://no-curl.patch"
7
8SRC_URI[md5sum] = "3f86f4eff53c94b7f285b3c59eb89754"
9SRC_URI[sha256sum] = "71fc7ff15fda50f16c9d73f701adf3bd67c9803a2304cd3d82cb490d76d3c3b3"
10
11LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
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"
29apt-utils-manpages="doc/apt-extracttemplates.1 \ 9apt-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
36def get_files_apt_doc(d, bb, manpages): 12def 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
66do_install () { 42do_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
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 973ccb5908..e3ca6d028d 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -5,17 +5,23 @@ SECTION = "base"
5SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ 5SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
6 file://no-ko-translation.patch \ 6 file://no-ko-translation.patch \
7 file://use-host.patch \ 7 file://use-host.patch \
8 file://localefixes.patch \
9 file://makerace.patch \ 8 file://makerace.patch \
10 file://remove-redeclaration.patch \ 9 file://no-nls-dpkg.patch \
10 file://fix-gcc-4.6-null-not-defined.patch \
11 file://truncate-filename.patch \ 11 file://truncate-filename.patch \
12 file://allocate-larger-memory.patch \ 12 file://nodoc.patch \
13 file://disable-configure-in-makefile.patch \
13 " 14 "
14 15
15inherit autotools gettext 16inherit autotools gettext
16 17
17EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" 18EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
18 19
20do_configure_prepend() {
21 rm -rf buildlib/config.sub
22 rm -rf buildlib/config.guess
23}
24
19# Apt wants to know the glibc version by running a binary file, which will 25# Apt wants to know the glibc version by running a binary file, which will
20# fail, so we have to tell configure which version to use Since I don't know 26# fail, so we have to tell configure which version to use Since I don't know
21# the impliations of setting a wrong value I only provide one for angstrom, 27# the impliations of setting a wrong value I only provide one for angstrom,
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.9.7.7.bb
index 7f1572bcd8..a9dcc74f75 100644
--- a/meta/recipes-devtools/apt/apt_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt_0.9.7.7.bb
@@ -3,13 +3,11 @@ RDEPENDS_${PN} = "dpkg"
3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" 3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
4require apt.inc 4require apt.inc
5 5
6PR = "r15" 6PR = "r0"
7 7
8SRC_URI += "file://nodoc.patch \
9 file://includes-fix.patch "
10 8
11SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814" 9SRC_URI[md5sum] = "039fc57668d1a0c2f62dc22e71900a16"
12SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045" 10SRC_URI[sha256sum] = "6eca4285f1ac2e8cb837b9546553b0546881ed15853aa5bbeb860bab6bfa1700"
13 11
14require apt-package.inc 12require apt-package.inc
15 13
diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch
index eb2f100d1c..9fd3b3ab79 100644
--- a/meta/recipes-devtools/apt/files/no-curl.patch
+++ b/meta/recipes-devtools/apt/files/no-curl.patch
@@ -5,11 +5,9 @@ Upstream-Status: Inappropriate [configuration]
5 methods/makefile | 7 ------- 5 methods/makefile | 7 -------
6 2 files changed, 13 deletions(-) 6 2 files changed, 13 deletions(-)
7 7
8--- apt-0.7.14.orig/configure.in 8--- a/configure.in
9+++ apt-0.7.14/configure.in 9+++ b/configure.in
10@@ -84,16 +84,10 @@ AC_CHECK_HEADER(db.h, 10@@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h,
11 )]
12 )
13 11
14 LIBS="$saveLIBS" 12 LIBS="$saveLIBS"
15 13
@@ -22,25 +20,19 @@ Upstream-Status: Inappropriate [configuration]
22 20
23 AC_SUBST(BDBLIB) 21 AC_SUBST(BDBLIB)
24 22
25 dnl Converts the ARCH to be something singular for this general CPU family 23--- a/methods/makefile
26 dnl This is often the dpkg architecture string. 24+++ b/methods/makefile
27--- apt-0.7.14.orig/methods/makefile 25@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile
28+++ apt-0.7.14/methods/makefile 26 SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
29@@ -50,17 +50,10 @@ PROGRAM=http
30 SLIBS = -lapt-pkg $(SOCKETLIBS)
31 LIB_MAKES = apt-pkg/makefile
32 SOURCE = http.cc rfc2553emu.cc connect.cc
33 include $(PROGRAM_H) 27 include $(PROGRAM_H)
34 28
35-# The https method 29-# The https method
36-PROGRAM=https 30-PROGRAM=https
37-SLIBS = -lapt-pkg -lcurl 31-SLIBS = -lapt-pkg -lcurl $(INTLLIBS)
38-LIB_MAKES = apt-pkg/makefile 32-LIB_MAKES = apt-pkg/makefile
39-SOURCE = https.cc 33-SOURCE = https.cc
40-include $(PROGRAM_H) 34-include $(PROGRAM_H)
41- 35-
42 # The ftp method 36 # The ftp method
43 PROGRAM=ftp 37 PROGRAM=ftp
44 SLIBS = -lapt-pkg $(SOCKETLIBS) 38 SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
45 LIB_MAKES = apt-pkg/makefile
46 SOURCE = ftp.cc rfc2553emu.cc connect.cc
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 20:43:41 +0000