[oe-commits] org.oe.dev merge of '0d78ba13efa94c8dc9d73148ac765d2208977709'

[pfalcon commit]

merge of '0d78ba13efa94c8dc9d73148ac765d2208977709'
     and 'd7f27bd501e6a8e1fa4cce2a6e67d50bea43e8b7'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 02197744870f6dc21b94c0ea89bdc2636c5aeae7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=02197744870f6dc21b94c0ea89bdc2636c5aeae7
Files:
1
classes/base.bbclass
conf/distro/angstrom-2007.1.conf
packages/images/devimage-image.bb
packages/linux/linux-handhelds-2.6.inc
packages/sysfsutils/sysfsutils_2.0.0.bb
Diffs:

#
# mt diff -r0d78ba13efa94c8dc9d73148ac765d2208977709 -r02197744870f6dc21b94c0ea89bdc2636c5aeae7
#
# 
# 
# patch "classes/base.bbclass"
#  from [ba2e0fac05c1cefedb5f538434372d5c24d922c5]
#    to [8a173bf48780618b184587ac961f0648715285fe]
# 
============================================================
--- classes/base.bbclass	ba2e0fac05c1cefedb5f538434372d5c24d922c5
+++ classes/base.bbclass	8a173bf48780618b184587ac961f0648715285fe
@@ -953,6 +953,7 @@ ftp://lsof.itap.purdue.edu/pub/tools/uni
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://sunsite.ualberta.ca/pub/Mirror/lsof/
 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  ftp://the.wiretapped.net/pub/security/host-security/lsof/
+http://www.apache.org/dist  http://archive.apache.org/dist
 
 }
 


#
# mt diff -rd7f27bd501e6a8e1fa4cce2a6e67d50bea43e8b7 -r02197744870f6dc21b94c0ea89bdc2636c5aeae7
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [8b80a1c95dae22cddbcc5efbca4f834aab273d56]
#    to [30089af9cd598e63f6822dc33dda537c997793c2]
# 
# patch "packages/images/devimage-image.bb"
#  from [522d69564f125613dfe3c1b5d6ddabb988157140]
#    to [e7df38db8d9f517f454ccf08a2c09078f3fdc580]
# 
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [367c2fb70210ecd095d94fa1b594f1b1be9a7723]
#    to [9e48a6e2e961f90636b27931c73fa87d941a314d]
# 
# patch "packages/sysfsutils/sysfsutils_2.0.0.bb"
#  from [49458232a31fb7bfd4afb40122ccfb3de667cf90]
#    to [72064161affb93785e5d1badb2cc1f32549bcfc1]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	8b80a1c95dae22cddbcc5efbca4f834aab273d56
+++ conf/distro/angstrom-2007.1.conf	30089af9cd598e63f6822dc33dda537c997793c2
@@ -128,6 +128,8 @@ PREFERRED_VERSION_linux-handhelds-2.6   
 
 #Preferred version for the kernel on various machines
 PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh11"
+RDEPENDS_kernel-base_hx4700 = ""
+RDEPENDS_kernel-base_htcuniversal = ""
 
 PREFERRED_VERSION_linux_at91sam9263ek               ?= "2.6.20"
 
============================================================
--- packages/images/devimage-image.bb	522d69564f125613dfe3c1b5d6ddabb988157140
+++ packages/images/devimage-image.bb	e7df38db8d9f517f454ccf08a2c09078f3fdc580
@@ -1,11 +1,16 @@
 # Image for kernel debugging and development testing
-# Contains minimal userspace shim (no udev, etc.), but all useful 
-# "kernel userspace" utilities (feel free to add missing).
+# It includes all useful "kernel userspace" utilities, but
+# only shell and dropbear are loaded by default.
 # Allows to login via serial and real console or SSH
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
-RDEPENDS = "devimage busybox dropbear module-init-tools wireless-tools wpa-supplicant irda-utils acx-firmware"
+DEVIMAGE_EXTRA_RDEPENDS ?= ""
+RDEPENDS = "devimage busybox dropbear udev \
+            module-init-tools pcmciautils \
+	    wireless-tools wpa-supplicant \
+	    irda-utils acx-firmware \
+	    ${DEVIMAGE_EXTRA_RDEPENDS}"
 
 export IMAGE_BASENAME = "devimage"
 export IMAGE_LINGUAS = ""
============================================================
--- packages/linux/linux-handhelds-2.6.inc	367c2fb70210ecd095d94fa1b594f1b1be9a7723
+++ packages/linux/linux-handhelds-2.6.inc	9e48a6e2e961f90636b27931c73fa87d941a314d
@@ -15,13 +15,7 @@ inherit kernel
 
 inherit kernel
 
-FILES_kernel-image_hx4700 = ""
-ALLOW_EMPTY_hx4700 = "1"
-FILES_kernel-image_htcuniversal = ""
-ALLOW_EMPTY_htcuniversal = "1"
 
-
-
 K_MAJOR ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
 K_MINOR ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
 K_MICRO ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
============================================================
--- packages/sysfsutils/sysfsutils_2.0.0.bb	49458232a31fb7bfd4afb40122ccfb3de667cf90
+++ packages/sysfsutils/sysfsutils_2.0.0.bb	72064161affb93785e5d1badb2cc1f32549bcfc1
@@ -1,7 +1,8 @@ PROVIDES = "libsysfs"
 DESCRIPTION = "System Utilities Based on Sysfs"
 HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
 LICENSE = "GPLv2"
 PROVIDES = "libsysfs"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
 S = "${WORKDIR}/sysfsutils-${PV}"
@@ -18,5 +19,5 @@ PACKAGES_prepend = "libsysfs "
 }
 
 PACKAGES_prepend = "libsysfs "
-FILES_libsysfs = "${libdir}/*.so.2.0.0"
+FILES_libsysfs = "${libdir}/*.so.*"