summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/flumotion/flumotion_0.4.1.bb14
-rw-r--r--packages/gcc/gcc-package-target.inc4
-rw-r--r--packages/rsync/rsync_2.6.9.bb4
-rw-r--r--packages/slugos-init/files/leds46
-rw-r--r--packages/slugos-init/slugos-init_4.8.bb2
5 files changed, 50 insertions, 20 deletions
diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb
index f709086846..976c8c4142 100644
--- a/packages/flumotion/flumotion_0.4.1.bb
+++ b/packages/flumotion/flumotion_0.4.1.bb
@@ -9,7 +9,7 @@ RDEPENDS = "python-resource python-pprint python-threading \
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,11 +21,7 @@ export EPYDOC = "no"
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 =+ "${PN}-dbg flumotion-gui"
+PACKAGES =+ "flumotion-gui"
FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion"
@@ -34,7 +30,11 @@ FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \
${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 \
diff --git a/packages/gcc/gcc-package-target.inc b/packages/gcc/gcc-package-target.inc
index 2c19c5ecc7..975aa88fe7 100644
--- a/packages/gcc/gcc-package-target.inc
+++ b/packages/gcc/gcc-package-target.inc
@@ -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 \
diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb
index 102f7e8eb8..075dfa7b09 100644
--- a/packages/rsync/rsync_2.6.9.bb
+++ b/packages/rsync/rsync_2.6.9.bb
@@ -1,6 +1,6 @@
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"
diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds
index 1beb013c5f..7a51a247ef 100644
--- a/packages/slugos-init/files/leds
+++ b/packages/slugos-init/files/leds
@@ -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)
diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb
index 2eca9c9ecf..37b82c582c 100644
--- a/packages/slugos-init/slugos-init_4.8.bb
+++ b/packages/slugos-init/slugos-init_4.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r4"
+PR = "r5"
SRC_URI = "file://boot/flash \
file://boot/disk \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 06:39:27 +0000