[oe-commits] org.oe.dev merge of '2d89d48451ccb04cdcce8533e88ab183e6fd5bbc'
hrw commit
openembedded-commits at lists.openembedded.org
Fri Aug 31 09:03:57 UTC 2007
merge of '2d89d48451ccb04cdcce8533e88ab183e6fd5bbc'
and 'd7c8a05b1dc7e5260900eea102e2e2aa5202e740'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 7feaf9dcf909ae62b8f271b3dd93994950226a86
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7feaf9dcf909ae62b8f271b3dd93994950226a86
Files:
1
packages/gcc/gcc-4.1.2/arm-crunch-20000320.patch
packages/gcc/gcc-4.1.2/arm-crunch-32bit-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-64bit-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-64bit-disable0.patch
packages/gcc/gcc-4.1.2/arm-crunch-Uy.patch
packages/gcc/gcc-4.1.2/arm-crunch-and-or.patch
packages/gcc/gcc-4.1.2/arm-crunch-cfabs-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-cfcvt64-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-cfcvtds-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-cfldr-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-cfldrstr-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-cirrus-bugfixes.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-geu.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-new.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-new2.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-new3.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-new4.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-new5.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-new6.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-new7.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-old.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-unordered.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare-unordered.patch-z-eq
packages/gcc/gcc-4.1.2/arm-crunch-compare.patch
packages/gcc/gcc-4.1.2/arm-crunch-compare.patch-z-eq
packages/gcc/gcc-4.1.2/arm-crunch-condexec-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-dominance.patch
packages/gcc/gcc-4.1.2/arm-crunch-double-nop-before.patch
packages/gcc/gcc-4.1.2/arm-crunch-eabi-ieee754-div.patch
packages/gcc/gcc-4.1.2/arm-crunch-eabi-ieee754.patch
packages/gcc/gcc-4.1.2/arm-crunch-eabi.patch
packages/gcc/gcc-4.1.2/arm-crunch-floatsi-disable-single.patch
packages/gcc/gcc-4.1.2/arm-crunch-floatsi-disable.patch
packages/gcc/gcc-4.1.2/arm-crunch-floatunsidf.patch
packages/gcc/gcc-4.1.2/arm-crunch-fp_consts.patch
packages/gcc/gcc-4.1.2/arm-crunch-neg.patch
packages/gcc/gcc-4.1.2/arm-crunch-neg2.patch
packages/gcc/gcc-4.1.2/arm-crunch-offset.patch
packages/gcc/gcc-4.1.2/arm-crunch-predicates.patch
packages/gcc/gcc-4.1.2/arm-crunch-predicates2.patch
packages/gcc/gcc-4.1.2/arm-crunch-predicates3.patch
packages/gcc/gcc-4.1.2/arm-crunch-predicates4-no_cond_exec.patch
packages/gcc/gcc-4.1.2/arm-crunch-predicates4.patch
packages/gcc/gcc-4.1.2/arm-crunch-saveregs.patch
packages/gcc/gcc-4.1.2/arm-crunch-scc.patch
packages/gcc/gcc-4.1.2/arm-crunch-truncsi-disable-new.patch
packages/gcc/gcc-4.1.2/arm-crunch-truncsi-disable.patch
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc_4.1.2.bb
packages/apt/apt-0.7.2
packages/apt/apt-0.7.2/noconfigure.patch
packages/apt/apt-0.7.2/nodoc.patch
packages/apt/apt-0.7.3/noconfigure.patch
packages/apt/apt-0.7.3/nodoc.patch
packages/apt/apt-native_0.7.3.bb
packages/apt/apt_0.7.2.bb
packages/apt/files/db_linking_hack.patch
packages/bluez/bluez-libs_3.17.bb
packages/bluez/bluez-utils_3.17.bb
packages/dpkg/dpkg-native_1.13.25.bb
packages/dpkg/dpkg_1.13.25.bb
packages/dpkg/files/autofoo.patch
packages/dpkg/files/nochroot.patch
packages/openmoko2/openmoko-firststart2_svn.bb
conf/distro/include/angstrom-package-deb.inc
conf/distro/include/angstrom-package-ipk.inc
packages/apt/apt-native.inc
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-package.inc
packages/apt/apt.inc
packages/apt/apt_0.7.3.bb
packages/apt/files/apt.conf
packages/efl1/imlib2_1.4.0.002.bb
packages/intltool/intltool_0.35.2.bb
packages/intltool/intltool_0.35.5.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
Diffs:
#
# mt diff -r2d89d48451ccb04cdcce8533e88ab183e6fd5bbc -r7feaf9dcf909ae62b8f271b3dd93994950226a86
#
#
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-20000320.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-32bit-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-64bit-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-64bit-disable0.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-Uy.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-and-or.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-cfabs-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-cfcvt64-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-cfcvtds-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-cfldr-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-cfldrstr-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-cirrus-bugfixes.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-geu.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-new.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-new2.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-new3.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-new4.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-new5.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-new6.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-new7.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-old.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-unordered.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare-unordered.patch-z-eq"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-compare.patch-z-eq"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-condexec-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-dominance.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-double-nop-before.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-eabi-ieee754-div.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-eabi-ieee754.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-eabi.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-floatsi-disable-single.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-floatsi-disable.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-floatunsidf.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-fp_consts.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-neg.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-neg2.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-offset.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-predicates.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-predicates2.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-predicates3.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-predicates4-no_cond_exec.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-predicates4.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-saveregs.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-scc.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-truncsi-disable-new.patch"
#
# delete "packages/gcc/gcc-4.1.2/arm-crunch-truncsi-disable.patch"
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [be2f2c53bbd220132778e60f9e959c8e95466e72]
# to [7c1b83bd533cc9f0be3ff22dfc2f2f421a61b51d]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [92b4c71fd457c19984cd6f787fafb290e92abcda]
# to [a3365911d02c077a5069a65c8c1bf4206ff39507]
#
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb be2f2c53bbd220132778e60f9e959c8e95466e72
+++ packages/gcc/gcc-cross_4.1.2.bb 7c1b83bd533cc9f0be3ff22dfc2f2f421a61b51d
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r5"
+PR = "r4"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_4.1.2.bb 92b4c71fd457c19984cd6f787fafb290e92abcda
+++ packages/gcc/gcc_4.1.2.bb a3365911d02c077a5069a65c8c1bf4206ff39507
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r3"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
@@ -28,33 +28,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://ldflags.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://unbreak-armv4t.patch;patch=1 \
- file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
file://cache-amnesia.patch;patch=1 \
- file://arm-crunch-saveregs.patch;patch=1 \
- file://arm-crunch-20000320.patch;patch=1 \
- file://arm-crunch-compare.patch;patch=1 \
- file://arm-crunch-compare-unordered.patch;patch=1 \
- file://arm-crunch-eabi-ieee754.patch;patch=1 \
- file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
- file://arm-crunch-64bit-disable0.patch;patch=1 \
- file://arm-crunch-offset.patch;patch=1 \
- file://arm-crunch-fp_consts.patch;patch=1 \
- file://arm-crunch-neg2.patch;patch=1 \
- file://arm-crunch-predicates4-no_cond_exec.patch;patch=1 \
- file://arm-crunch-cfcvtds-disable.patch;patch=1 \
- file://arm-crunch-floatsi-disable.patch;patch=1 \
- file://arm-crunch-truncsi-disable.patch;patch=1 \
- file://arm-crunch-64bit-disable.patch;patch=1 \
- file://arm-crunch-condexec-disable.patch;patch=1 \
- file://arm-crunch-Uy.patch;patch=1 \
- file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
"
-
-
-# file://arm-crunch-compare-geu.patch;patch=1 \
-# file://arm-crunch-cfldrstr-disable.patch;patch=1 \
-
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
#Set the fortran bits
#
# mt diff -rd7c8a05b1dc7e5260900eea102e2e2aa5202e740 -r7feaf9dcf909ae62b8f271b3dd93994950226a86
#
#
#
# add_dir "packages/apt/apt-0.7.2"
#
# add_file "packages/apt/apt-0.7.2/noconfigure.patch"
# content [7a699aa22ec66db96f1c74509c516248667eecc6]
#
# add_file "packages/apt/apt-0.7.2/nodoc.patch"
# content [431fc02b36a1717361e00c039d9b5e76fed2400e]
#
# add_file "packages/apt/apt-0.7.3/noconfigure.patch"
# content [7a699aa22ec66db96f1c74509c516248667eecc6]
#
# add_file "packages/apt/apt-0.7.3/nodoc.patch"
# content [431fc02b36a1717361e00c039d9b5e76fed2400e]
#
# add_file "packages/apt/apt-native_0.7.3.bb"
# content [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#
# add_file "packages/apt/apt_0.7.2.bb"
# content [63322e840f089261ba0cacb99e97bda6eb5b1998]
#
# add_file "packages/apt/files/db_linking_hack.patch"
# content [78e814b56591e57d0dc5f24daa3ddffd16c9cb75]
#
# add_file "packages/bluez/bluez-libs_3.17.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils_3.17.bb"
# content [a6515be5f7deaf5c7ae08f4d976c5b84644d682f]
#
# add_file "packages/dpkg/dpkg-native_1.13.25.bb"
# content [8eb3c6c608cb583af3b69f62c8990813f25028ca]
#
# add_file "packages/dpkg/dpkg_1.13.25.bb"
# content [447b8af2ef375b9607b5df7961b6bd2d573eeef3]
#
# add_file "packages/dpkg/files/autofoo.patch"
# content [15327c7fb1d0937364adeae5f0f1f018eedf8843]
#
# add_file "packages/dpkg/files/nochroot.patch"
# content [96c39aa83c0bb252677018577b751073b25a096d]
#
# add_file "packages/openmoko2/openmoko-firststart2_svn.bb"
# content [27beb8f34a18a7dd7801124efa91a5379e4c6e31]
#
# patch "conf/distro/include/angstrom-package-deb.inc"
# from [8335e823a868d57d55708c602a26223d00ab6084]
# to [be11d0b7af5f39c3d0c5c078b8cc3e094902401f]
#
# patch "conf/distro/include/angstrom-package-ipk.inc"
# from [440a6b52c9a5ad608b32d2bbbd73a677595a08b1]
# to [12aedbd89f58b526ccfac397fb732e4b0954248e]
#
# patch "packages/apt/apt-native.inc"
# from [a769f6140c62cd893e6a1e6db61328f9fcedd298]
# to [7d71c4e22b26c5f9a8250469cdc9224ede94d19b]
#
# patch "packages/apt/apt-native_0.7.2.bb"
# from [4fff433a631dd3b390cedffba74b1a4f6e27c067]
# to [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
#
# patch "packages/apt/apt-package.inc"
# from [98879b990295f5dc07b4370ea749543c96919432]
# to [776b438ed4e20204678a1baba2ed113b69e73334]
#
# patch "packages/apt/apt.inc"
# from [c2c9cd779cbedaf6c40ab6784a3a8396eed51497]
# to [d69d638878972a4e5bbfd066a98930704fc107e5]
#
# patch "packages/apt/apt_0.7.3.bb"
# from [f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c]
# to [b35d540f7bc7597c24ad2ee48b326f68b11b2a73]
#
# patch "packages/apt/files/apt.conf"
# from [a11cde2c27f3b4a221c40eeca244e9a87cdf1a09]
# to [efa1759f4e7e6b32306177bf4462c89759ca5466]
#
# patch "packages/efl1/imlib2_1.4.0.002.bb"
# from [58a676b069eb953275a7f7356044d18b6693b484]
# to [8b80e93373cdcb6aa046dbbdc02f134fddcd0004]
#
# patch "packages/intltool/intltool_0.35.2.bb"
# from [0977773fdceaf48de1f2ecf707588efc80ebbaf5]
# to [b2a500d5a8d63fc7037432fb701119f427dd5233]
#
# patch "packages/intltool/intltool_0.35.5.bb"
# from [d7421f692953a0f3ab3a695009c3ba6c50c932e2]
# to [3988342f58d7e4721fe3ce448611d40b792d577c]
#
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# from [10c5f028c9b6c543f29a92c40be16b67b5115751]
# to [8f9ad5c93b1857a0649e886d81d0470451dab960]
#
============================================================
--- packages/apt/apt-0.7.2/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
+++ packages/apt/apt-0.7.2/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
@@ -0,0 +1,35 @@
+---
+ apt-pkg/packagemanager.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc
++++ apt-0.6.45exp2/apt-pkg/packagemanager.cc
+@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI
+
+ List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+
++#if 0
+ // Perform immedate configuration of the package.
+ if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
+ if (SmartConfigure(Pkg) == false)
+ return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
++#endif
+
+ return true;
+ }
+@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag
+ DoneSomething = true;
+ }
+
++#if 0
+ // Final run through the configure phase
+ if (ConfigureAll() == false)
+ return Failed;
+@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag
+ return Failed;
+ }
+ }
++#endif
+
+ return Completed;
+ }
============================================================
--- packages/apt/apt-0.7.2/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
+++ packages/apt/apt-0.7.2/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
@@ -0,0 +1,15 @@
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- apt-0.6.45exp2.orig/Makefile
++++ apt-0.6.45exp2/Makefile
+@@ -17,7 +17,7 @@ all headers library clean veryclean bina
+ $(MAKE) -C cmdline $@
+ $(MAKE) -C ftparchive $@
+ $(MAKE) -C dselect $@
+- $(MAKE) -C doc $@
++# $(MAKE) -C doc $@
+ $(MAKE) -C po $@
+
+ # Some very common aliases
============================================================
--- packages/apt/apt-0.7.3/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
+++ packages/apt/apt-0.7.3/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
@@ -0,0 +1,35 @@
+---
+ apt-pkg/packagemanager.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc
++++ apt-0.6.45exp2/apt-pkg/packagemanager.cc
+@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI
+
+ List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+
++#if 0
+ // Perform immedate configuration of the package.
+ if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
+ if (SmartConfigure(Pkg) == false)
+ return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
++#endif
+
+ return true;
+ }
+@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag
+ DoneSomething = true;
+ }
+
++#if 0
+ // Final run through the configure phase
+ if (ConfigureAll() == false)
+ return Failed;
+@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag
+ return Failed;
+ }
+ }
++#endif
+
+ return Completed;
+ }
============================================================
--- packages/apt/apt-0.7.3/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
+++ packages/apt/apt-0.7.3/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
@@ -0,0 +1,15 @@
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- apt-0.6.45exp2.orig/Makefile
++++ apt-0.6.45exp2/Makefile
+@@ -17,7 +17,7 @@ all headers library clean veryclean bina
+ $(MAKE) -C cmdline $@
+ $(MAKE) -C ftparchive $@
+ $(MAKE) -C dselect $@
+- $(MAKE) -C doc $@
++# $(MAKE) -C doc $@
+ $(MAKE) -C po $@
+
+ # Some very common aliases
============================================================
--- packages/apt/apt-native_0.7.3.bb 8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
+++ packages/apt/apt-native_0.7.3.bb 8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
@@ -0,0 +1,5 @@
+require apt-native.inc
+PR = "r2"
+
+SRC_URI += "file://nodoc.patch;patch=1 \
+ file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt_0.7.2.bb 63322e840f089261ba0cacb99e97bda6eb5b1998
+++ packages/apt/apt_0.7.2.bb 63322e840f089261ba0cacb99e97bda6eb5b1998
@@ -0,0 +1,9 @@
+require apt.inc
+PR = "r2"
+
+SRC_URI += "file://nodoc.patch;patch=1"
+
+require apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
============================================================
--- packages/apt/files/db_linking_hack.patch 78e814b56591e57d0dc5f24daa3ddffd16c9cb75
+++ packages/apt/files/db_linking_hack.patch 78e814b56591e57d0dc5f24daa3ddffd16c9cb75
@@ -0,0 +1,27 @@
+Index: apt-0.7.3/configure.in
+===================================================================
+--- apt-0.7.3.orig/configure.in 2007-07-01 10:38:45.000000000 +0000
++++ apt-0.7.3/configure.in 2007-08-21 13:39:26.000000000 +0000
+@@ -67,8 +67,20 @@
+ [AC_DEFINE(HAVE_BDB)
+ BDBLIB="-ldb"
+ AC_MSG_RESULT(yes)],
+- [BDBLIB=""
+- AC_MSG_RESULT(no)]
++
++ LIBS="$LIBS -lpthread"
++ [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread)
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM(
++ [#include <db.h>],
++ [int r, s, t; db_version(&r, &s, &t);]
++ )],
++ [AC_DEFINE(HAVE_BDB)
++ BDBLIB="-ldb -lpthread"
++ AC_MSG_RESULT(yes)],
++ [BDBLIB=""
++ AC_MSG_RESULT(no)]
++ )]
+ )]
+ )
+
============================================================
--- packages/bluez/bluez-libs_3.17.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.17.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils_3.17.bb a6515be5f7deaf5c7ae08f4d976c5b84644d682f
+++ packages/bluez/bluez-utils_3.17.bb a6515be5f7deaf5c7ae08f4d976c5b84644d682f
@@ -0,0 +1,116 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+# ti patch doesn't apply, people using it should rediff it and send it upstream
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+# file://hciattach-ti-bts.patch;patch=1 \
+ "
+PR = "r0"
+
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+# The config options are explained below:
+
+# --enable-obex enable OBEX support
+# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+# --enable-cups install CUPS backend support
+# --enable-bccmd install BCCMD interface utility
+# --enable-avctrl install Audio/Video control utility
+# --enable-hid2hci install HID mode switching utility
+# --enable-dfutool install DFU firmware upgrade utility
+
+# --enable-glib For systems that use and install GLib anyway
+# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+# --enable-network
+# --enable-serial
+# --enable-input
+# --enable-audio
+# --enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+# --enable-configfile
+# --enable-initscripts
+
+#For even smaller -doc packages
+# --disable-manpages
+# --disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+# --disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat ${PN}-alsa"
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN} = " \
+ ${base_sbindir}/hcid \
+ ${libdir}/bluetooth \
+ ${sysconfdir}/init.d/bluetooth \
+ ${sysconfdir}/bluetooth/*.service \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default \
+ ${sysconfdir}/dbus-1 \
+ ${base_sbindir}/hciattach \
+ "
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/.debug \
+ ${libdir}/cups/backend/.debug \
+ ${libdir}/alsa-lib/.debug \
+ "
+
+FILES_${PN}-compat = " \
+ ${base_bindir}/sdptool \
+ ${base_bindir}/dund \
+ ${base_bindir}/rctest \
+ ${base_bindir}/ciptool \
+ ${base_bindir}/l2test \
+ ${base_bindir}/rfcomm \
+ ${base_bindir}/hcitool \
+ ${base_bindir}/pand \
+ ${base_bindir}/hidd \
+ ${base_bindir}/l2ping \
+ ${base_sbindir}/hciconfig \
+ ${base_sbindir}/bccmd \
+ ${base_sbindir}/hciemu \
+ ${base_sbindir}/hid2hci \
+ ${base_bindir}/passkey-agent \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
============================================================
--- packages/dpkg/dpkg-native_1.13.25.bb 8eb3c6c608cb583af3b69f62c8990813f25028ca
+++ packages/dpkg/dpkg-native_1.13.25.bb 8eb3c6c608cb583af3b69f62c8990813f25028ca
@@ -0,0 +1,14 @@
+require dpkg.inc
+PR = "r0"
+DEPENDS += "zlib-native"
+SRC_URI += "file://noman.patch;patch=1"
+
+inherit native
+
+EXTRA_OECONF = "--without-static-progs \
+ --without-dselect \
+ --with-start-stop-daemon \
+ --with-zlib \
+ --with-bz2lib \
+ --without-selinux \
+ --without-sgml-doc"
============================================================
--- packages/dpkg/dpkg_1.13.25.bb 447b8af2ef375b9607b5df7961b6bd2d573eeef3
+++ packages/dpkg/dpkg_1.13.25.bb 447b8af2ef375b9607b5df7961b6bd2d573eeef3
@@ -0,0 +1,11 @@
+require dpkg.inc
+PR = "r0"
+DEPENDS += "ncurses zlib bzip2"
+SRC_URI += "file://noman.patch;patch=1"
+
+EXTRA_OECONF = "--without-static-progs \
+ --without-dselect \
+ --with-start-stop-daemon \
+ --with-zlib \
+ --with-bz2lib \
+ --without-sgml-doc"
============================================================
--- packages/dpkg/files/autofoo.patch 15327c7fb1d0937364adeae5f0f1f018eedf8843
+++ packages/dpkg/files/autofoo.patch 15327c7fb1d0937364adeae5f0f1f018eedf8843
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- dpkg-1.10.23/configure.in~autofoo
++++ dpkg-1.10.23/configure.in
+@@ -227,21 +227,36 @@
+ # OpenBSD passes AC_TRY_COMPILE for va_copy even though
+ # it doesn't seem to exist, which is odd. We need to use
+ # AC_TRY_RUN.
++#
++# If crosscompiling, use AC_TRY_COMPILE. -CL
+ AC_TRY_RUN([
+ #include <stdarg.h>
+ main(){
+ va_list v1,v2;
+ va_copy(v1, v2);
+ exit(0);}
+-], [AC_MSG_RESULT(yes)
+-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
+-AC_MSG_CHECKING([for va_list assignment copy])
++], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no],
+ AC_TRY_COMPILE([
+ #include <stdarg.h>
++main(){
++va_list v1,v2;
++va_copy(v1, v2);
++exit(0);}
++], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no]))
++
++if test "$dpkg_cv_va_copy" = "yes"; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])
++else
++ AC_MSG_RESULT(no)
++ AC_MSG_CHECKING([for va_list assignment copy])
++ AC_TRY_COMPILE([
++#include <stdarg.h>
+ ],[
+ va_list v1,v2;
+ v1 = v2;
+-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
++], AC_MSG_RESULT(yes), AC_MSG_ERROR(no))
++fi
+
+ DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
+ DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
============================================================
--- packages/dpkg/files/nochroot.patch 96c39aa83c0bb252677018577b751073b25a096d
+++ packages/dpkg/files/nochroot.patch 96c39aa83c0bb252677018577b751073b25a096d
@@ -0,0 +1,18 @@
+---
+ src/help.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- dpkg-1.13.22.orig/src/help.c
++++ dpkg-1.13.22/src/help.c
+@@ -175,9 +175,11 @@ static const char* preexecscript(const c
+ */
+ size_t instdirl;
+
++#if 0
+ if (*instdir) {
+ if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
+ }
++#endif
+ if (f_debug & dbg_scripts) {
+ fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path)%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list