From 1d91c1d9470461aaee1e961614b557596972067f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 13:27:50 +0000
Subject: apt: sync apt.conf with Poky

---
 packages/apt/apt_0.6.46.2.bb | 3 +--
 packages/apt/files/apt.conf  | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'packages/apt')

diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb
index 1cd8eb270e..73285f37c3 100644
--- a/packages/apt/apt_0.6.46.2.bb
+++ b/packages/apt/apt_0.6.46.2.bb
@@ -1,7 +1,6 @@
 require apt.inc
 
-SRC_URI += "file://autofoo.patch;patch=1 \
-            file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch;patch=1"
 
 require apt-package.inc
 
diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf
index fc19018533..6fd653dfcd 100644
--- a/packages/apt/files/apt.conf
+++ b/packages/apt/files/apt.conf
@@ -21,6 +21,10 @@ Dir "${STAGING_DIR}/"
       apt-get "apt-get";
       apt-cache "apt-cache";
    };
+   Etc "etc/apt/"
+   {
+      Preferences "preferences";
+   };
 };
 
 APT
-- 
cgit v1.2.3


From 09b18d1fff43cef84dcaa8fa0723f0e38b92d5d1 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 27 Mar 2007 17:58:00 +0000
Subject: apt-package.inc: disable magic that doesn't work and causes builds to
 fail. Disable oe_libinstall as well, since lib* got built statically * people
 that care about and/or know apt internals should fix this

---
 packages/apt/apt-package.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/apt')

diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc
index 43f54cadab..8bf2b56739 100644
--- a/packages/apt/apt-package.inc
+++ b/packages/apt/apt-package.inc
@@ -77,11 +77,11 @@ 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, = ,=,'`
-	oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/
-	ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
-	oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/
-	ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
+	#eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
+	#oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true
+	#ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
+	#oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true
+	#ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
 
 	install -d ${D}${libdir}/apt/methods
 	install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
-- 
cgit v1.2.3


From 1566696e78ee5757811d43ef5eae09bad406d050 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 27 Mar 2007 18:27:43 +0000
Subject: apt.inc: provide an example on how to provide the glibc version to
 configure

---
 packages/apt/apt.inc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'packages/apt')

diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc
index b18ed93782..dbf5765205 100644
--- a/packages/apt/apt.inc
+++ b/packages/apt/apt.inc
@@ -8,3 +8,8 @@ S = "${WORKDIR}/apt-${PV}"
 inherit autotools gettext
 
 EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
+
+# Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use
+# Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4)
+# Koen - 20070327
+EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4"
-- 
cgit v1.2.3


From edc40a59a0f44223deacd1291e5e80b7b9360897 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 29 Mar 2007 11:56:01 +0000
Subject: packages/apt/apt_0.6.46.2.bb packages/apt/apt.inc
 packages/apt/apt-package.inc : build and package shared libs at all times.

---
 packages/apt/apt-package.inc         | 17 ++++++++++++-----
 packages/apt/apt.inc                 |  6 ++++--
 packages/apt/apt_0.6.46.2.bb         |  3 +++
 packages/apt/files/environment.patch | 13 +++++++++++++
 4 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 packages/apt/files/environment.patch

(limited to 'packages/apt')

diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc
index 8bf2b56739..5a5d56930e 100644
--- a/packages/apt/apt-package.inc
+++ b/packages/apt/apt-package.inc
@@ -77,11 +77,18 @@ 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, = ,=,'`
-	#oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true
-	#ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
-	#oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true
-	#ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
+	install -d ${D}${libdir}
+	eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
+	eval `cat apt-pkg/makefile | grep ^MAJOR | sed -e's, = ,=,'`
+	eval `cat apt-pkg/makefile | grep ^MINOR | sed -e's, = ,=,'`
+	install bin/libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/
+	ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg$GLIBC_VER-6.so.$MAJOR
+	ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg.so
+	eval `cat apt-inst/makefile | grep ^MAJOR | sed -e's, = ,=,'`
+	eval `cat apt-inst/makefile | grep ^MINOR | sed -e's, = ,=,'`
+	install bin/libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/
+	ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst$GLIBC_VER-6.so.$MAJOR
+	ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst.so
 
 	install -d ${D}${libdir}/apt/methods
 	install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc
index dbf5765205..283b80d662 100644
--- a/packages/apt/apt.inc
+++ b/packages/apt/apt.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg."
 LICENSE = "GPL"
 SECTION = "base"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
+           file://environment.patch;patch=1"
 S = "${WORKDIR}/apt-${PV}"
 
 inherit autotools gettext
@@ -12,4 +13,5 @@ EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
 # Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use
 # Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4)
 # Koen - 20070327
-EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4"
+EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4"
+
diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb
index 73285f37c3..24023f2a58 100644
--- a/packages/apt/apt_0.6.46.2.bb
+++ b/packages/apt/apt_0.6.46.2.bb
@@ -6,3 +6,6 @@ require apt-package.inc
 
 FILES_${PN} += "${bindir}/apt-key"
 apt-manpages += "doc/apt-key.8"
+
+PR = "r1"
+
diff --git a/packages/apt/files/environment.patch b/packages/apt/files/environment.patch
new file mode 100644
index 0000000000..5bea1a0130
--- /dev/null
+++ b/packages/apt/files/environment.patch
@@ -0,0 +1,13 @@
+Index: apt-0.6.46.2/buildlib/environment.mak.in
+===================================================================
+--- apt-0.6.46.2.orig/buildlib/environment.mak.in	2007-03-29 11:38:58.000000000 +0100
++++ apt-0.6.46.2/buildlib/environment.mak.in	2007-03-29 11:39:12.000000000 +0100
+@@ -62,7 +62,7 @@
+ 
+ # Shared library things
+ HOST_OS = @host_os@
+-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0)
+    SONAME_MAGIC=-Wl,-soname -Wl,
+    LFLAGS_SO=
+ else
-- 
cgit v1.2.3


From d65fd4bd8ca6ff9fd758a933b867f10e903a9f7a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 2 Jul 2007 12:31:44 +0000
Subject: apt: update to 0.7.2, fix debug packaging

---
 packages/apt/apt-0.7.2/.mtn2git_empty |  0
 packages/apt/apt-native.inc           |  2 +-
 packages/apt/apt-native_0.7.2.bb      |  4 ++++
 packages/apt/apt.inc                  |  2 ++
 packages/apt/apt_0.7.2.bb             | 11 +++++++++++
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 packages/apt/apt-0.7.2/.mtn2git_empty
 create mode 100644 packages/apt/apt-native_0.7.2.bb
 create mode 100644 packages/apt/apt_0.7.2.bb

(limited to 'packages/apt')

diff --git a/packages/apt/apt-0.7.2/.mtn2git_empty b/packages/apt/apt-0.7.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/apt/apt-native.inc b/packages/apt/apt-native.inc
index de9426bf70..b615693e64 100644
--- a/packages/apt/apt-native.inc
+++ b/packages/apt/apt-native.inc
@@ -1,7 +1,7 @@
 require apt.inc
 inherit native
 
-DEPENDS += "dpkg-native"
+DEPENDS += "dpkg-native curl-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
 PACKAGES = ""
 USE_NLS = "no"
diff --git a/packages/apt/apt-native_0.7.2.bb b/packages/apt/apt-native_0.7.2.bb
new file mode 100644
index 0000000000..43f73889f7
--- /dev/null
+++ b/packages/apt/apt-native_0.7.2.bb
@@ -0,0 +1,4 @@
+require apt-native.inc
+
+SRC_URI += "file://nodoc.patch;patch=1 \
+            file://noconfigure.patch;patch=1"
diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc
index 283b80d662..2644866c5b 100644
--- a/packages/apt/apt.inc
+++ b/packages/apt/apt.inc
@@ -15,3 +15,5 @@ EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
 # Koen - 20070327
 EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4"
 
+FILES_${PN}-dbg += "${libdir}/apt/methods/.debug" 
+
diff --git a/packages/apt/apt_0.7.2.bb b/packages/apt/apt_0.7.2.bb
new file mode 100644
index 0000000000..24023f2a58
--- /dev/null
+++ b/packages/apt/apt_0.7.2.bb
@@ -0,0 +1,11 @@
+require apt.inc
+
+SRC_URI += "file://nodoc.patch;patch=1"
+
+require apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
+
+PR = "r1"
+
-- 
cgit v1.2.3


From 671ddaea3f5f4523ab8f7bdd2db19028d52bc1b3 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 16 Jul 2007 20:03:19 +0000
Subject: apt: upgrade to 0.7.3 * 0.7.2 has become unfetchable on the Debian
 mirrors * 0.7.2 was broken (failed do_patch), the same applies for 0.7.3.  
 IOW, it was broken before, it is still broken now, but   hopefully less so. *
 more information in bug 2017 comment 6

---
 packages/apt/apt-0.7.2/.mtn2git_empty |  0
 packages/apt/apt-0.7.3/.mtn2git_empty |  0
 packages/apt/apt_0.7.2.bb             | 11 -----------
 packages/apt/apt_0.7.3.bb             | 11 +++++++++++
 4 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 packages/apt/apt-0.7.2/.mtn2git_empty
 create mode 100644 packages/apt/apt-0.7.3/.mtn2git_empty
 delete mode 100644 packages/apt/apt_0.7.2.bb
 create mode 100644 packages/apt/apt_0.7.3.bb

(limited to 'packages/apt')

diff --git a/packages/apt/apt-0.7.2/.mtn2git_empty b/packages/apt/apt-0.7.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/apt/apt-0.7.3/.mtn2git_empty b/packages/apt/apt-0.7.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/apt/apt_0.7.2.bb b/packages/apt/apt_0.7.2.bb
deleted file mode 100644
index 24023f2a58..0000000000
--- a/packages/apt/apt_0.7.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require apt.inc
-
-SRC_URI += "file://nodoc.patch;patch=1"
-
-require apt-package.inc
-
-FILES_${PN} += "${bindir}/apt-key"
-apt-manpages += "doc/apt-key.8"
-
-PR = "r1"
-
diff --git a/packages/apt/apt_0.7.3.bb b/packages/apt/apt_0.7.3.bb
new file mode 100644
index 0000000000..24023f2a58
--- /dev/null
+++ b/packages/apt/apt_0.7.3.bb
@@ -0,0 +1,11 @@
+require apt.inc
+
+SRC_URI += "file://nodoc.patch;patch=1"
+
+require apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
+
+PR = "r1"
+
-- 
cgit v1.2.3