summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/angstrom-2007.1.conf6
-rw-r--r--conf/distro/debianslug.conf6
-rw-r--r--conf/distro/openslug.conf6
-rw-r--r--conf/machine/titan.conf7
-rw-r--r--conf/machine/wrap.conf9
-rw-r--r--packages/angstrom/task-angstrom-x11.bb6
-rw-r--r--packages/bluez/bluez-gnome_0.6.bb10
-rw-r--r--packages/gcc/gcc-cross-sdk_4.1.1.bb2
-rw-r--r--packages/gpe-themes/gpe-theme-foxbox_0.1.bb2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.19-rc6.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.18-hh1.bb11
-rw-r--r--packages/linux/linux-handhelds-2.6_cvs.bb2
-rw-r--r--packages/slugos-init/files/initscripts/umountinitrd.sh13
-rw-r--r--packages/slugos-init/files/modulefunctions1
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
15 files changed, 68 insertions, 17 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 91708aba37..6a872e28ba 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
#DISTRO_VERSION = "2007.1"
DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "12"
+DISTRO_REVISION = "13"
require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
@@ -88,7 +88,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_VERSION_fontconfig = "2.3.95"
PREFERRED_VERSION_freetype = "2.2.1"
#fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.2"
+PREFERRED_VERSION_cairo = "1.3.4"
#Small machines prefer kdrive, but we might ship full Xorg in other images
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -183,6 +183,8 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
PREFERRED_VERSION_hostap-modules ?= "0.4.7"
PREFERRED_VERSION_hostap-utils ?= "0.4.7"
+PREFERRED_VERSION_wpa-supplicant = "0.5.5"
+
#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index c570d7c18f..0b333e2f01 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -108,6 +108,12 @@ kernel-module-sd-mod \
kernel-module-usb-storage \
"
+# Add modules required for IDE support
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-libata \
+kernel-module-pata-artop \
+"
+
# This documents other file systems which are built but not installed
# by default in the flash image.
#
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 4277888bfa..55a6942a4f 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -108,6 +108,12 @@ kernel-module-sd-mod \
kernel-module-usb-storage \
"
+# Add modules required for IDE support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-libata \
+kernel-module-pata-artop \
+"
+
# This documents other file systems which are built but not installed
# by default in the flash image.
#
diff --git a/conf/machine/titan.conf b/conf/machine/titan.conf
index 99f8b2a18b..a7ce106356 100644
--- a/conf/machine/titan.conf
+++ b/conf/machine/titan.conf
@@ -24,8 +24,11 @@ USE_DEVFS = "0"
IMAGE_FSTYPE ?= "ext2.gz"
IMAGE_ROOTFS_SIZE_ext2 ?= "63984"
-# Extra items to include in the fs image
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel pciutils udev kernel-modules lilo-sh"
+# Things to include in the fs image
+MACHINE_FEATURES = "kernel26 pci ext2 usbhost"
+MACHINE_TASK_PROVIDER = "task-base"
+# The kernel and lilo-sh need to installed to boot from flash
+MACHINE_EXTRA_RDEPENDS = "kernel lilo-sh"
# Add the SCI (serial) and SM (flash) devices to the minimal /dev
IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index 592be8dd3c..e0c65475f6 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the PC Engines WRAP (Wireless Router Application Platform) boards.
TARGET_ARCH = "i486"
-PACKAGE_EXTRA_ARCHS = "i386"
+PACKAGE_EXTRA_ARCHS = "i386 x86"
PREFERRED_PROVIDER_virtual/kernel = "linux-wrap-geode"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
@@ -21,8 +21,11 @@ USE_DEVFS = "0"
# partition on the compact flash card being used.
IMAGE_FSTYPE ?= "tar.gz"
-# Extra items to include in the fs image
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel pciutils udev kernel-modules grub"
+# Things to include in the fs image
+MACHINE_FEATURES = "kernel26 pci ext2"
+MACHINE_TASK_PROVIDER = "task-base"
+# The kernel and grub need to installed to boot from flash
+MACHINE_EXTRA_RDEPENDS = "kernel grub"
# Minimal device table is fine
IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt"
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 13bc3efc4f..e72691f345 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r23"
+PR = "r24"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -24,6 +24,7 @@ RDEPENDS_angstrom-x11-base-depends := "\
RDEPENDS_angstrom-gpe-task-base := "\
matchbox \
+ matchbox-panel-hacks \
xcursor-transparent-theme \
rxvt-unicode \
gpe-terminal \
@@ -89,7 +90,8 @@ RDEPENDS_angstrom-gpe-task-games := "\
gpe-othello \
gpe-tetris \
gsoko \
- xdemineur"
+# xdemineur \
+"
RDEPENDS_angstrom-task-office := "\
gnumeric \
diff --git a/packages/bluez/bluez-gnome_0.6.bb b/packages/bluez/bluez-gnome_0.6.bb
new file mode 100644
index 0000000000..481a383019
--- /dev/null
+++ b/packages/bluez/bluez-gnome_0.6.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "bluez-libs dbus-glib gconf libnotify gtk+ openobex"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 7233f79504..e3050d3926 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
-require gcc_${PV}.bb
PR = "r0"
inherit sdk
@@ -12,5 +11,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
PACKAGES = "${PN}"
+require gcc_${PV}.bb
require gcc4-build-sdk.inc
require gcc-package-sdk.inc
diff --git a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
index 5e2bd90ce1..c2b829ab74 100644
--- a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
@@ -10,4 +10,4 @@ S = "${WORKDIR}/foxbox"
FILES_${PN} = "${datadir}/themes"
-SRC_URI = "http://dominion.kabel.utwente.nl/~florian/themes/foxbox-${PV}.tar.gz"
+SRC_URI = "http://linuxtogo.org/~florian/themes/foxbox-${PV}.tar.gz"
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
index 83d77472ab..7620aedb0c 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "589"
+IXP4XX_KERNEL_SVN_REV = "591"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/linux/linux-handhelds-2.6_2.6.18-hh1.bb b/packages/linux/linux-handhelds-2.6_2.6.18-hh1.bb
new file mode 100644
index 0000000000..b34d4630a0
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.18-hh1.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index e921643a53..1c1d8f38fe 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -7,7 +7,7 @@ PR = "r5"
K_MAJOR = "2"
K_MINOR = "6"
K_MICRO = "18"
-HHV = "0"
+HHV = "1"
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \
file://defconfig"
diff --git a/packages/slugos-init/files/initscripts/umountinitrd.sh b/packages/slugos-init/files/initscripts/umountinitrd.sh
index 9cb1f7a25d..2798fe5985 100644
--- a/packages/slugos-init/files/initscripts/umountinitrd.sh
+++ b/packages/slugos-init/files/initscripts/umountinitrd.sh
@@ -5,20 +5,27 @@
# then the /initrd is mounted and we want to remount that
# ro - this works round the shutdown -r hang problem
. /etc/default/functions
+
+case "$(machine)" in
+nslu2)
+ ffspart="Flashdisk";;
+*)
+ ffspart="filesystem";;
+esac
+
while read device directory remainder
do
case "$directory" in
/mnt) echo "InitRD: unmount initrd on /mnt" >&2
umount /mnt;;
/initrd)# need the device for a remount
- ffspart=Flashdisk
ffsdev="$(mtblockdev $ffspart)"
- echo "InitRD: remount $ffdev read-only on /initrd" >&2
+ echo "Remounting $ffsdev read-only on /initrd" >&2
if test -n "$ffsdev" -a -b "$ffsdev"
then
mount -o remount,ro "$ffsdev" /initrd
else
- echo "Flashdisk: $ffsdev: flash device not found" >&2
+ echo "$ffspart: $ffsdev: flash device not found" >&2
fi;;
esac
done </proc/mounts
diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions
index d7c2b9777c..1073dae4fb 100644
--- a/packages/slugos-init/files/modulefunctions
+++ b/packages/slugos-init/files/modulefunctions
@@ -13,6 +13,7 @@ loaddiskmods(){
modprobe ohci-hcd
;;
nas100d)
+ modprobe pata-artop
modprobe ehci-hcd
modprobe uhci-hcd
;;
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index de3b6151c1..54c1993c67 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 = "r73"
+PR = "r74"
SRC_URI = "file://boot/flash \
file://boot/disk \
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 19:20:49 +0000