[oe-commits] org.oe.dev merge of '0d93ec84b30bc1bee2caaee72d667f87bc468a70'
mickeyl commit
oe at amethyst.openembedded.net
Sun Mar 23 17:17:24 UTC 2008
merge of '0d93ec84b30bc1bee2caaee72d667f87bc468a70'
and '4d3f6129ff74b55c246c109b0515837fb4fcef27'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2237d83e6d0fc264b6516f3b0f282a68732ba4d1
ViewMTN: http://monotone.openembedded.org/revision/info/2237d83e6d0fc264b6516f3b0f282a68732ba4d1
Files:
1
packages/mpfr/mpfr-native_2.3.0.bb
packages/mpfr/mpfr-native_2.3.1.bb
packages/mpfr/mpfr_2.3.0.bb
packages/mpfr/mpfr_2.3.1.bb
packages/tetex
packages/nonworking/tetex
conf/machine/mpc8313e-rdb.conf
packages/glib-2.0/glib-2.0_2.16.1.bb
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/slugos-init/files/sysconf
packages/slugos-init/slugos-init_4.8.bb
packages/wlan-ng/wlan-ng-modules.inc
packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-modules_0.2.3.bb
packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
packages/wlan-ng/wlan-ng-modules_0.2.7.bb
packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
packages/wlan-ng/wlan-ng-modules_svn.bb
packages/wlan-ng/wlan-ng-utils.inc
packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-utils_0.2.3.bb
packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-utils_0.2.7.bb
packages/wlan-ng/wlan-ng-utils_0.2.8.bb
packages/wlan-ng/wlan-ng-utils_svn.bb
classes/autotools.bbclass
classes/efl.bbclass
conf/distro/include/sane-srcdates.inc
packages/efl1/ecore-native_cvs.bb
packages/efl1/eet-native_cvs.bb
Diffs:
#
# mt diff -r0d93ec84b30bc1bee2caaee72d667f87bc468a70 -r2237d83e6d0fc264b6516f3b0f282a68732ba4d1
#
#
#
# rename "packages/mpfr/mpfr-native_2.3.0.bb"
# to "packages/mpfr/mpfr-native_2.3.1.bb"
#
# rename "packages/mpfr/mpfr_2.3.0.bb"
# to "packages/mpfr/mpfr_2.3.1.bb"
#
# rename "packages/tetex"
# to "packages/nonworking/tetex"
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [d5214f50084711f3545cb37ff6f25d89d668e9d2]
# to [a86f35c16d9ce38ad61eb7bc2319acac6084e802]
#
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
# from [d529224930628fa212035aa5d6d59d7868e6caf4]
# to [3a48d903a74285a67c66bab7fd96be2bf1e1270a]
#
# patch "packages/initrdscripts/files/init.sh"
# from [f01a2b1d615165dd1f22c6ce448caad76fe2bc21]
# to [28d18ffa609edec8052c315345c34e219a03fa7e]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06]
# to [36899b0b286458882b6c7dc82f858b7e130a026e]
#
# patch "packages/mpfr/mpfr_2.3.1.bb"
# from [b20fb238456f28535fb57b617caa5604cb87c127]
# to [5cddf656cfc181d1b6c96d93b3c84c10bbb47f34]
#
# patch "packages/slugos-init/files/sysconf"
# from [4742342792c7cda553ad6d667b8380ec8bca1121]
# to [7b8a065a170668148dceedebd8ac6828d2e0a966]
#
# patch "packages/slugos-init/slugos-init_4.8.bb"
# from [f1d83bb6efd47859e2fa618a8f46c7956a5305a5]
# to [3cc7d29041e1c5b8ccd51759b5772dd0a44bb8e3]
#
# patch "packages/wlan-ng/wlan-ng-modules.inc"
# from [9474ac9b757e9c7ae8e85ce133a8f7d2357d7522]
# to [fb6cba86430c37eeb3877b759dac9935a5ff0eb8]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb"
# from [465a33a423488e0bf6beac835e67d6823a787369]
# to [7a883cffa53023f5ce0cadd8d96e555f934f0da3]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.3.bb"
# from [7b4d62bc3180f8524205a4d38ec06b5d007ed73c]
# to [ad1322ac7fcf94816ad0bc364d0c859cdbc4b7e7]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb"
# from [a69633a4d6942c8928d51b240144b359c7876a26]
# to [bbeac95cb8e4b3b3dd3dd4ced4813e5e88af17eb]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb"
# from [fbfb8b8f6ce971b39598d7b7439a29d1a80bd006]
# to [c1aa7ed1162e3e676da84da6b82811a56b538a67]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.7.bb"
# from [eaf518590d6acebdd35fcd19d1ce91cc2c6fc805]
# to [b948b5f25ed94937cfaca544748e05efe4362dc3]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb"
# from [410e1ad3bd2225723374c9c98fb848c20bef61d8]
# to [3e4dd9c232b9b3182b0cfb69536ee0fb4625cd28]
#
# patch "packages/wlan-ng/wlan-ng-modules_svn.bb"
# from [81e83b49cc5c22b8e3737339843390121d244a92]
# to [0ab0d1dca59c2075aece2abd3462b78f6d6ce384]
#
# patch "packages/wlan-ng/wlan-ng-utils.inc"
# from [e2a62370e4e850b3d5a933dac0793eb3d35ead6a]
# to [27e32e1bce6e9f224d2b27b54e56fed7d87998c9]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb"
# from [1e9dc87127f307617fe44af03fc256a82223ce9d]
# to [8e1e04f04db88842c5849ac71cced305bc68f9eb]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.3.bb"
# from [1df8fe394ad7e6395a116f90be3fad6b0f80dd9a]
# to [e6e7e57d1fcbf1500f4e4adbcbdb464870efc293]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb"
# from [17277cd3d25e45adef8268b44d455323c84846aa]
# to [71a5ec863184fa8a7fc52799bcf5e5585d7c2de5]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.7.bb"
# from [4ce418904c8b39baad69268f821d8b0881701394]
# to [2e4a991bd035cd13922dfdb82ce2d919dce1deb6]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.8.bb"
# from [c5fd6799aeb817b3ba2dd8a42f0e9c6179a0e71b]
# to [4ce418904c8b39baad69268f821d8b0881701394]
#
# patch "packages/wlan-ng/wlan-ng-utils_svn.bb"
# from [f143922414fe20748d67c86ac43627a249810a39]
# to [94c910884d22097437afc4ceb365d319b382f951]
#
============================================================
--- conf/machine/mpc8313e-rdb.conf d5214f50084711f3545cb37ff6f25d89d668e9d2
+++ conf/machine/mpc8313e-rdb.conf a86f35c16d9ce38ad61eb7bc2319acac6084e802
@@ -8,7 +8,7 @@ PREFERRED_VERSION_u-boot ?= "git"
PREFERRED_PROVIDER_virtual/kernel ?= "linux"
PREFERRED_VERSION_u-boot ?= "git"
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
KERNEL_IMAGETYPE = "uImage"
============================================================
--- packages/glib-2.0/glib-2.0_2.16.1.bb d529224930628fa212035aa5d6d59d7868e6caf4
+++ packages/glib-2.0/glib-2.0_2.16.1.bb 3a48d903a74285a67c66bab7fd96be2bf1e1270a
@@ -1,5 +1,7 @@ require glib.inc
require glib.inc
+PR = "r3"
+
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
file://configure-libtool.patch;patch=1 \
============================================================
--- packages/initrdscripts/files/init.sh f01a2b1d615165dd1f22c6ce448caad76fe2bc21
+++ packages/initrdscripts/files/init.sh 28d18ffa609edec8052c315345c34e219a03fa7e
@@ -41,9 +41,11 @@ load_modules() {
load_modules() {
for module in $MODULE_DIR/$1; do
- # Cannot redir to $CONSOLE here easily - may not be set yet
- echo "initramfs: Loading $module module"
- source $module
+ if [ -e "$module" ]; then
+ # Cannot redir to $CONSOLE here easily - may not be set yet
+ echo "initramfs: Loading $module module"
+ source $module
+ fi
done
}
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb 78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb 36899b0b286458882b6c7dc82f858b7e130a026e
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
SRC_URI = "file://init.sh"
-PR = "r8"
+PR = "r9"
DESCRIPTON = "A modular initramfs init script system."
RRECOMMENDS = "kernel-module-mtdblock"
============================================================
--- packages/mpfr/mpfr_2.3.0.bb b20fb238456f28535fb57b617caa5604cb87c127
+++ packages/mpfr/mpfr_2.3.1.bb 5cddf656cfc181d1b6c96d93b3c84c10bbb47f34
@@ -1,7 +1,7 @@ DEPENDS = "gmp"
require mpfr.inc
DEPENDS = "gmp"
-PR = "r1"
+PR = "r0"
SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
S = "${WORKDIR}/mpfr-${PV}"
============================================================
--- packages/slugos-init/files/sysconf 4742342792c7cda553ad6d667b8380ec8bca1121
+++ packages/slugos-init/files/sysconf 7b8a065a170668148dceedebd8ac6828d2e0a966
@@ -665,6 +665,8 @@ sysconf_restore(){
#
mkdir "$saved" || {
sysconf_restore_error "$ffsdir" "$saved: failed to create temporary directory"
+ umount "$ffsdir" && rmdir "$ffsdir" ||
+ echo "$0: $ffsdir: temporary directory cleanup failed" >&2
return 1
}
#
@@ -678,6 +680,8 @@ sysconf_restore(){
) || {
rm -rf "$saved"
sysconf_restore_error "$ffsdir" "$saved: cpio -i failed"
+ umount "$ffsdir" && rmdir "$ffsdir" ||
+ echo "$0: $ffsdir: temporary directory cleanup failed" >&2
return 1
}
# either there must be no 'diff' files or it must
============================================================
--- packages/slugos-init/slugos-init_4.8.bb f1d83bb6efd47859e2fa618a8f46c7956a5305a5
+++ packages/slugos-init/slugos-init_4.8.bb 3cc7d29041e1c5b8ccd51759b5772dd0a44bb8e3
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://boot/flash \
file://boot/disk \
============================================================
--- packages/wlan-ng/wlan-ng-modules.inc 9474ac9b757e9c7ae8e85ce133a8f7d2357d7522
+++ packages/wlan-ng/wlan-ng-modules.inc fb6cba86430c37eeb3877b759dac9935a5ff0eb8
@@ -2,8 +2,6 @@ DEPENDS = "virtual/kernel"
HOMEPAGE = "http://www.linux-wlan.org"
SECTION = "kernel/modules"
DEPENDS = "virtual/kernel"
-RRECOMMENDS = "wlan-ng-utils"
-RPROVIDES += "wlan-ng-modules-usb wlan-ng-modules"
LICENSE = "GPL"
SRC_URI = "file://no-compat.patch;patch=1 \
@@ -55,15 +53,22 @@ do_install() {
# Listen closely... sssshhh... can you hear the wlan-ng build system suck?
rm -f ${KERNEL_SOURCE}/../config.mk
rm -f ${KERNEL_SOURCE}/../../config.mk
+
+ # man page and configure scripts are shipped by wlan-ng-utils
+ rm -rf ${D}/usr/local/man
+ rm -rf ${D}/etc
}
-PACKAGES = "${PN}-dbg wlan-ng-modules-usb wlan-ng-modules-cs wlan-ng-modules-pci wlan-ng-modules-p80211"
-FILES_wlan-ng-modules-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
+PACKAGES =+ "${PN}-p80211 ${PN}-usb ${PN}-cs ${PN}-pci"
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_plx${KERNEL_OBJECT_SUFFIX}"
+
+RDEPENDS_${PN}-p80211 = "wlan-ng-utils"
+RDEPENDS_${PN} = "${PN}-p80211"
+RDEPENDS_${PN}-usb = "${PN}-p80211"
+RDEPENDS_${PN}-cs = "${PN}-p80211"
+RDEPENDS_${PN}-pci = "${PN}-p80211"
-RDEPENDS_wlan-ng-modules-p80211 = "wlan-ng-utils"
-RDEPENDS_wlan-ng-modules-usb = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-cs = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-pci = "wlan-ng-modules-p80211"
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb 465a33a423488e0bf6beac835e67d6823a787369
+++ packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb 7a883cffa53023f5ce0cadd8d96e555f934f0da3
@@ -1,6 +1,6 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \
file://no-compat.patch;patch=1 \
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.3.bb 7b4d62bc3180f8524205a4d38ec06b5d007ed73c
+++ packages/wlan-ng/wlan-ng-modules_0.2.3.bb ad1322ac7fcf94816ad0bc364d0c859cdbc4b7e7
@@ -1,9 +1,8 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://prism2sta_commsqual_defer.patch;patch=1 \
file://modules-symvers.patch;patch=1 \
file://usb-owner.patch;patch=1 "
S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb a69633a4d6942c8928d51b240144b359c7876a26
+++ packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb bbeac95cb8e4b3b3dd3dd4ced4813e5e88af17eb
@@ -1,5 +1,7 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
+PR = "r1"
+
SRCDATE = "20060823"
PV = "0.2.4+svn${SRCDATE}"
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb fbfb8b8f6ce971b39598d7b7439a29d1a80bd006
+++ packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb c1aa7ed1162e3e676da84da6b82811a56b538a67
@@ -1,8 +1,9 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
+PR = "r1"
+
SRCDATE = "20061109"
PV = "0.2.5+svn${SRCDATE}"
SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
S = "${WORKDIR}/trunk"
-
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.7.bb eaf518590d6acebdd35fcd19d1ce91cc2c6fc805
+++ packages/wlan-ng/wlan-ng-modules_0.2.7.bb b948b5f25ed94937cfaca544748e05efe4362dc3
@@ -1,6 +1,6 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://2.6.22-fixes.patch;patch=1"
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb 410e1ad3bd2225723374c9c98fb848c20bef61d8
+++ packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb 3e4dd9c232b9b3182b0cfb69536ee0fb4625cd28
@@ -1,9 +1,10 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
+PR = "r1"
+
SRCDATE = "20080315"
PV = "0.2.8+svn${SRCDATE}"
SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
S = "${WORKDIR}/trunk"
-
============================================================
--- packages/wlan-ng/wlan-ng-modules_svn.bb 81e83b49cc5c22b8e3737339843390121d244a92
+++ packages/wlan-ng/wlan-ng-modules_svn.bb 0ab0d1dca59c2075aece2abd3462b78f6d6ce384
@@ -1,5 +1,5 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
-PR = "r0"
+PR = "r1"
PV = "0.2.4+svn${SRCDATE}"
SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
============================================================
--- packages/wlan-ng/wlan-ng-utils.inc e2a62370e4e850b3d5a933dac0793eb3d35ead6a
+++ packages/wlan-ng/wlan-ng-utils.inc 27e32e1bce6e9f224d2b27b54e56fed7d87998c9
@@ -61,8 +61,8 @@ do_install() {
install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
install -d ${D}${mandir}/man1
install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+ rm -rf ${D}/usr/local/man
}
-FILES_${PN}-doc += "/usr/local/man"
FILES_${PN}-dbg += "/sbin/.debug"
FILES_${PN} = "/etc /sbin"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb 1e9dc87127f307617fe44af03fc256a82223ce9d
+++ packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb 8e1e04f04db88842c5849ac71cced305bc68f9eb
@@ -1,3 +1,3 @@ require wlan-ng-utils.inc
require wlan-ng-utils.inc
+PR = "r2"
-PR = "r1"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.3.bb 1df8fe394ad7e6395a116f90be3fad6b0f80dd9a
+++ packages/wlan-ng/wlan-ng-utils_0.2.3.bb e6e7e57d1fcbf1500f4e4adbcbdb464870efc293
@@ -1,6 +1,6 @@ require wlan-ng-utils.inc
require wlan-ng-utils.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb 17277cd3d25e45adef8268b44d455323c84846aa
+++ packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb 71a5ec863184fa8a7fc52799bcf5e5585d7c2de5
@@ -1,5 +1,7 @@ require wlan-ng-utils.inc
require wlan-ng-utils.inc
+PR = "r1"
+
SRCDATE = "20060823"
PV = "0.2.4+svn${SRCDATE}"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.7.bb 4ce418904c8b39baad69268f821d8b0881701394
+++ packages/wlan-ng/wlan-ng-utils_0.2.7.bb 2e4a991bd035cd13922dfdb82ce2d919dce1deb6
@@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-host
file://pcmciasrc.patch;patch=1 \
file://hostldflags.patch;patch=1"
+PR = "r2"
-PR = "r1"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.8.bb c5fd6799aeb817b3ba2dd8a42f0e9c6179a0e71b
+++ packages/wlan-ng/wlan-ng-utils_0.2.8.bb 4ce418904c8b39baad69268f821d8b0881701394
@@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-host
file://pcmciasrc.patch;patch=1 \
file://hostldflags.patch;patch=1"
+PR = "r1"
-PR = "r0"
============================================================
--- packages/wlan-ng/wlan-ng-utils_svn.bb f143922414fe20748d67c86ac43627a249810a39
+++ packages/wlan-ng/wlan-ng-utils_svn.bb 94c910884d22097437afc4ceb365d319b382f951
@@ -1,6 +1,6 @@ require wlan-ng-utils.inc
require wlan-ng-utils.inc
-PR = "r2"
+PR = "r3"
PV = "0.2.4+svn${SRCDATE}"
SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
#
# mt diff -r4d3f6129ff74b55c246c109b0515837fb4fcef27 -r2237d83e6d0fc264b6516f3b0f282a68732ba4d1
#
#
#
# patch "classes/autotools.bbclass"
# from [a03edf4667fb88b98d0f6ea62adcf75168d43bea]
# to [aca69d07902b5d16cc3be9cc17ba2089144114e5]
#
# patch "classes/efl.bbclass"
# from [812d079a9b429c552508ab74839a4404eb45a0df]
# to [3dac4fa59998910d604314f5e2234dc380a6d4e6]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [f95a0a7a90230afcb63264eef972e31be7d8622f]
# to [20d693a8ea203b3e5f9a1fe533b82f6d8c711e9b]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [c6e59d187a86e3879d6706eec131fcb2ef20df8f]
# to [688512a330cc37fbb975d193067418992f848e29]
#
# patch "packages/efl1/eet-native_cvs.bb"
# from [fb7051cc00a6ec87793f53562dab0a8229f70586]
# to [f1eb7337a9729eb35e16944982c089f25752aede]
#
============================================================
--- classes/autotools.bbclass a03edf4667fb88b98d0f6ea62adcf75168d43bea
+++ classes/autotools.bbclass aca69d07902b5d16cc3be9cc17ba2089144114e5
@@ -214,7 +214,19 @@ autotools_stage_all() {
echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}"
cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
fi
+
fi
+ # Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files,
+ # however some packages rely on the presence of .pc files to enable/disable
+ # their configurataions in which case we better should not install everything
+ # unconditionally, but rather depend on the actual results of make install.
+ # The good news though: a) there are not many packages doing this and
+ # b) packaged staging will fix that anyways. :M:
+ if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ]
+ then
+ echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
+ cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
+ fi
rm -rf ${STAGE_TEMP}/${mandir} || true
rm -rf ${STAGE_TEMP}/${infodir} || true
autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR}
============================================================
--- classes/efl.bbclass 812d079a9b429c552508ab74839a4404eb45a0df
+++ classes/efl.bbclass 3dac4fa59998910d604314f5e2234dc380a6d4e6
@@ -4,8 +4,11 @@ S = "${WORKDIR}/${SRCNAME}"
SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}"
S = "${WORKDIR}/${SRCNAME}"
+DEPENDS += "pkgconfig-native"
-inherit autotools pkgconfig
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+# do NOT inherit pkgconfig here, see note in autotools_stage_all
+inherit autotools
do_stage() {
autotools_stage_all
============================================================
--- conf/distro/include/sane-srcdates.inc f95a0a7a90230afcb63264eef972e31be7d8622f
+++ conf/distro/include/sane-srcdates.inc 20d693a8ea203b3e5f9a1fe533b82f6d8c711e9b
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080321"
+EFL_SRCDATE = "20080129"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/efl1/ecore-native_cvs.bb c6e59d187a86e3879d6706eec131fcb2ef20df8f
+++ packages/efl1/ecore-native_cvs.bb 688512a330cc37fbb975d193067418992f848e29
@@ -4,9 +4,6 @@ EXTRA_OECONF = "\
PR = "r3"
EXTRA_OECONF = "\
- --x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} \
- \
--enable-ecore-txt \
--disable-ecore-config \
--disable-ecore-x-xcb \
@@ -16,6 +13,7 @@ EXTRA_OECONF = "\
--disable-ecore-sdl \
--enable-ecore-fb \
--enable-ecore-evas \
+ --enable-ecore-evas-fb \
--disable-ecore-evas-x11-gl \
--disable-ecore-evas-xrender \
--disable-ecore-evas-dfb \
============================================================
--- packages/efl1/eet-native_cvs.bb fb7051cc00a6ec87793f53562dab0a8229f70586
+++ packages/efl1/eet-native_cvs.bb f1eb7337a9729eb35e16944982c089f25752aede
@@ -1,3 +1,6 @@ DEPENDS = "zlib-native jpeg-native"
require eet_cvs.bb
inherit native
DEPENDS = "zlib-native jpeg-native"
+# we no longer inherit pkgconfig, so we need to state this explicitly
+# (see explanation in efl.bbclass and autotools.bbclass)
+DEPENDS += "pkgconfig-native"
More information about the Openembedded-commits
mailing list