diff options
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 7 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.01.bb | 2 | ||||
| -rw-r--r-- | packages/gbluezconf/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gbluezconf/gbluezconf_00.10.bb | 12 | ||||
| -rw-r--r-- | packages/slugos-init/files/leds | 22 | ||||
| -rw-r--r-- | packages/slugos-init/files/turnup | 5 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 |
7 files changed, 37 insertions, 13 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4cfea8e3da..c91437f54f 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -23,6 +23,9 @@ include conf/distro/preferred-opie-versions.inc # GPE include conf/distro/preferred-gpe-versions-2.8.inc +#zap extra stuff taking place in $MACHINE.conf +GPE_EXTRA_INSTALL = "" + # E include conf/distro/preferred-e-versions.inc @@ -31,6 +34,10 @@ PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_libx11 = "diet-x11" +#Make sure we use 2.6 on machines with a 2.4/2.6 selector +KERNEL = "kernel26" +ZKERNEL_VERSION = "2.6" + PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb index cbef98d992..7df9d5ad02 100644 --- a/packages/busybox/busybox_1.01.bb +++ b/packages/busybox/busybox_1.01.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r9" +PR = "r10" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcppidfile.patch;patch=1 \ diff --git a/packages/gbluezconf/.mtn2git_empty b/packages/gbluezconf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gbluezconf/.mtn2git_empty diff --git a/packages/gbluezconf/gbluezconf_00.10.bb b/packages/gbluezconf/gbluezconf_00.10.bb new file mode 100644 index 0000000000..2b0f210954 --- /dev/null +++ b/packages/gbluezconf/gbluezconf_00.10.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "GTK panel applet to control bluetooth stuff" +LICENSE = "GPLv2" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" + +DEPENDS = "bluez-utils-dbus libglade dbus libnotify popt gtk+" +SRC_URI = "http://www.cin.ufpe.br/~ckt/gbluezconf/${P}.tar.gz" + +inherit autotools pkgconfig + + + + diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds index 433467b96f..f5011f8bad 100644 --- a/packages/slugos-init/files/leds +++ b/packages/slugos-init/files/leds @@ -50,18 +50,20 @@ led_set(){ echo -n timer case "$setting" in - flash) echo -n 0.6;; - blink) echo -n 0.6;; - slow) echo -n 1;; - fast) echo -n 3;; - panic) echo -n 6;; - esac >"$1/frequency" + flash) echo -n 60;; + blink) echo -n 540;; + slow) echo -n 500;; + fast) echo -n 1500;; + panic) echo -n 3000;; + esac >"$1/delay_on" case "$setting" in - flash) echo -n 10;; - blink) echo -n 90;; - *) echo -n 50;; - esac >"$1/duty";; + flash) echo -n 540;; + blink) echo -n 60;; + slow) echo -n 500;; + fast) echo -n 1500;; + panic) echo -n 3000;; + esac >"$1/delay_off";; cpu-idle) echo -n cpu # these settings work well on NSLU2 diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index b365a49dda..0a51e1abf7 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -84,7 +84,10 @@ get_flash() { return 1 } - ffsdev="$(mtblockdev Flashdisk)" + case "$(machine)" in + nas100d) ffsdev="$(mtblockdev filesystem)";; + *) ffsdev="$(mtblockdev Flashdisk)";; + esac umountflash "$ffsdev" && mountflash "$ffsdev" "$ffsdir" "$@" } diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 971f6cf288..182d204b15 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r58" +PR = "r59" SRC_URI = "file://boot/flash \ file://boot/disk \ |