[oe-commits] org.oe.dev merge of '96db59323d7ef9906344cc1f7228b381c996ab07'
thebohemian commit
oe at amethyst.openembedded.net
Thu Apr 3 22:07:46 UTC 2008
merge of '96db59323d7ef9906344cc1f7228b381c996ab07'
and 'd69636e5f2a11a4de46efbbc1b4972a8a0186d3b'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 58f3d45c535ca2e847a96727f15d71f43b0fe468
ViewMTN: http://monotone.openembedded.org/revision/info/58f3d45c535ca2e847a96727f15d71f43b0fe468
Files:
1
packages/flumotion/flumotion_0.4.1.bb
packages/gcc/gcc-package-target.inc
packages/rsync/rsync_2.6.9.bb
packages/slugos-init/files/leds
packages/slugos-init/slugos-init_4.8.bb
packages/classpath/classpath-minimal_0.97.bb
packages/classpath/classpath_0.97.bb
packages/classpath/classpath-minimal_0.97.1.bb
packages/classpath/classpath_0.97.1.bb
Diffs:
#
# mt diff -r96db59323d7ef9906344cc1f7228b381c996ab07 -r58f3d45c535ca2e847a96727f15d71f43b0fe468
#
#
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
# from [70c85428af57546952476b8d1a63581c1f51b43b]
# to [888ee41205578b445b00295429cddc535e80a0f3]
#
# patch "packages/gcc/gcc-package-target.inc"
# from [6217d30373536c98f38cfc4aa3b0ac894933a675]
# to [4b684b472845fdcfa0097afca580c0a3767aa195]
#
# patch "packages/rsync/rsync_2.6.9.bb"
# from [c04a11b738d476c5a38376838a0c9a42a41cc5b4]
# to [46d56c1ae65397da35a2b8871cfecde62e0a382e]
#
# patch "packages/slugos-init/files/leds"
# from [24aa798d8ca8877e75d2307dff73aedb6e7d107a]
# to [a8c1cfca1b8aa19ac2ec92d4835b46b680b1b2fe]
#
# patch "packages/slugos-init/slugos-init_4.8.bb"
# from [d527fb3796c109605dc769795fc18fb7f0c2e066]
# to [75e3e3bbb749ba3ed4b9dd416c48f960db65b58f]
#
============================================================
--- packages/flumotion/flumotion_0.4.1.bb 70c85428af57546952476b8d1a63581c1f51b43b
+++ packages/flumotion/flumotion_0.4.1.bb 888ee41205578b445b00295429cddc535e80a0f3
@@ -9,7 +9,7 @@ RDEPENDS_${PN}-gui = "${PN} python-pygtk
python-lang python-zopeinterface python-textutils \
python-gst python-misc"
RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
-PR = "r9"
+PR = "r10"
SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
file://python-path.patch;patch=1 \
@@ -21,12 +21,8 @@ EXTRA_OECONF += "--with-python-includes=
EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-#Yes, we know:
-#ERROR: flumotion-dbg is listed in PACKAGES mutliple times, this leads to packaging errors.
-#ERROR: Please fix the metadata/report this as bug to OE bugtracker.
+PACKAGES =+ "flumotion-gui"
-PACKAGES =+ "${PN}-dbg flumotion-gui"
-
FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion"
FILES_${PN}-dev += "${libdir}/pkgconfig"
@@ -34,7 +30,11 @@ FILES_${PN}-gui = "${bindir}/flumotion-a
${libdir}/flumotion/python/flumotion/admin/gtk \
${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \
${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \
- ${libdir}/flumotion/python/flumotion/extern \
+ ${libdir}/flumotion/python/flumotion/extern/*.py* \
+ ${libdir}/flumotion/python/flumotion/extern/fdpass/*.py* \
+ ${libdir}/flumotion/python/flumotion/extern/fdpass/fdpass.so \
+ ${libdir}/flumotion/python/flumotion/extern/pytrayicon/*.py* \
+ ${libdir}/flumotion/python/flumotion/extern/pytrayicon/pytrayicon.so \
${libdir}/flumotion/python/flumotion/manager \
${libdir}/flumotion/python/flumotion/ui \
${libdir}/flumotion/python/flumotion/wizard \
============================================================
--- packages/gcc/gcc-package-target.inc 6217d30373536c98f38cfc4aa3b0ac894933a675
+++ packages/gcc/gcc-package-target.inc 4b684b472845fdcfa0097afca580c0a3767aa195
@@ -115,9 +115,9 @@ do_install () {
if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
mv ${D}${libdir}/nof/libgcc_s.so.* ${D}${base_libdir}
else
- mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+ mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} || true
fi
- rm -f ${D}${libdir}/libgcc_s.so
+ rm -f ${D}${libdir}/libgcc_s.so || true
ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \
| tr -s / \
| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \
============================================================
--- packages/rsync/rsync_2.6.9.bb c04a11b738d476c5a38376838a0c9a42a41cc5b4
+++ packages/rsync/rsync_2.6.9.bb 46d56c1ae65397da35a2b8871cfecde62e0a382e
@@ -1,6 +1,6 @@ require rsync.inc
require rsync.inc
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://rsync.samba.org/ftp/old-versions/rsync/rsync-${PV}.tar.gz \
+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \
file://rsyncd.conf"
============================================================
--- packages/slugos-init/files/leds 24aa798d8ca8877e75d2307dff73aedb6e7d107a
+++ packages/slugos-init/files/leds a8c1cfca1b8aa19ac2ec92d4835b46b680b1b2fe
@@ -81,8 +81,8 @@ sysled_readystatus(){
esac;;
esac
- led_set "$1/ready" "$ready"
- led_set "$1/status" "$status"
+ led_set "$1/$ready_led_name" "$ready"
+ led_set "$1/$status_led_name" "$status"
}
#
# the cases for one LED (just ready)
@@ -104,7 +104,7 @@ sysled_ready(){
esac;;
esac
- led_set "$1/ready" "$ready"
+ led_set "$1/$ready_led_name" "$ready"
}
#
# the cases for one blue flashing LED (just power)
@@ -126,7 +126,7 @@ sysled_power(){
esac;;
esac
- led_set "$1/power" "$power"
+ led_set "$1/$power_led_name" "$power"
}
#
sysled(){
@@ -154,16 +154,16 @@ sysled(){
fi
#
# check for the 'ready' LED - otherwise check for a 'power' LED
- if test -d "$mp/class/leds/ready"
+ if test -d "$mp/class/leds/$ready_led_name"
then
- if test -d "$mp/class/leds/status"
+ if test -d "$mp/class/leds/$status_led_name"
then
sysled_readystatus "$mp/class/leds" $boot"$@"
else
sysled_ready "$mp/class/leds" $boot"$@"
fi
else
- if test -d "$mp/class/leds/power"
+ if test -d "$mp/class/leds/$power_led_name"
then
sysled_power "$mp/class/leds" $boot"$@"
fi
@@ -211,7 +211,37 @@ leds_help(){
echo " if possible cause the machine to emit a beep" >&2
}
-#
+# Define the LED names based on kernel version.
+version=$(uname -r | cut -c -6)
+if [ "$version" \< "2.6.25" ]; then
+ status_led_name="status"
+ ready_led_name="ready"
+ power_led_name="power"
+else
+ case "$(machine)" in
+ dsmg600)
+ status_led_name="none"
+ ready_led_name="none"
+ power_led_name="dsmg600:green:power"
+ ;;
+ fsg3)
+ status_led_name="none"
+ ready_led_name="fsg:blue:sync"
+ power_led_name="none"
+ ;;
+ nas100d)
+ status_led_name="none"
+ ready_led_name="none"
+ power_led_name="nas100d:blue:power"
+ ;;
+ nslu2)
+ status_led_name="nslu2:red:status"
+ ready_led_name="nslu2:green:ready"
+ power_led_name="none"
+ ;;
+ esac
+fi
+
# the real command, if required
case "$1" in
boot|system|user|singleuser|shutdown)
============================================================
--- packages/slugos-init/slugos-init_4.8.bb d527fb3796c109605dc769795fc18fb7f0c2e066
+++ packages/slugos-init/slugos-init_4.8.bb 75e3e3bbb749ba3ed4b9dd416c48f960db65b58f
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r4"
+PR = "r5"
SRC_URI = "file://boot/flash \
file://boot/disk \
#
# mt diff -rd69636e5f2a11a4de46efbbc1b4972a8a0186d3b -r58f3d45c535ca2e847a96727f15d71f43b0fe468
#
#
#
# delete "packages/classpath/classpath-minimal_0.97.bb"
#
# delete "packages/classpath/classpath_0.97.bb"
#
# add_file "packages/classpath/classpath-minimal_0.97.1.bb"
# content [0ef04bfd389c769d1b67f97975fcdd35f68c4855]
#
# add_file "packages/classpath/classpath_0.97.1.bb"
# content [db8b170f0f6f53145caf1d439efa49971f8c4475]
#
============================================================
--- packages/classpath/classpath-minimal_0.97.1.bb 0ef04bfd389c769d1b67f97975fcdd35f68c4855
+++ packages/classpath/classpath-minimal_0.97.1.bb 0ef04bfd389c769d1b67f97975fcdd35f68c4855
@@ -0,0 +1,18 @@
+require classpath.inc
+
+PR = "r0"
+
+PROVIDES = "${PN} classpath"
+
+EXTRA_OECONF += "\
+ --enable-local-sockets \
+ --disable-alsa \
+ --disable-gconf-peer \
+ --disable-gtk-peer \
+ --disable-plugin \
+ --disable-dssi \
+ --disable-examples \
+ "
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
+
============================================================
--- packages/classpath/classpath_0.97.1.bb db8b170f0f6f53145caf1d439efa49971f8c4475
+++ packages/classpath/classpath_0.97.1.bb db8b170f0f6f53145caf1d439efa49971f8c4475
@@ -0,0 +1,18 @@
+require classpath.inc
+
+PR = "r0"
+
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+ --disable-alsa \
+ --disable-dssi \
+ --disable-qt4-peer \
+ --disable-plugin \
+ --enable-gconf-peer \
+ --enable-gtk-peer \
+ --enable-local-sockets \
+ --with-vm=java \
+ "
+
+
More information about the Openembedded-commits
mailing list