summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/foonas.conf8
-rw-r--r--conf/machine/include/lsppc.conf1
-rw-r--r--conf/machine/lsarm.conf33
-rw-r--r--conf/machine/lsppchd.conf4
-rw-r--r--conf/machine/lsppchg.conf4
-rw-r--r--conf/machine/n2100.conf1
-rw-r--r--conf/machine/turbostation.conf6
-rw-r--r--packages/directfb/directfb_1.0.0.bb7
-rw-r--r--packages/libxml/libxml2_2.6.26.bb3
-rw-r--r--packages/uboot/files/u-boot-20060807.tar.bz2bin6446218 -> 0 bytes
-rw-r--r--packages/uboot/files/u-boot-20060907.tar.bz2bin6535380 -> 0 bytes
-rw-r--r--packages/uboot/u-boot_1.2.0.bb4
12 files changed, 63 insertions, 8 deletions
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index becad95786..6dd4f0d781 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -21,6 +21,12 @@ DISTRO_FEATURES_n2100 += "raid"
DISTRO_FEATURES_storcenter += "raid"
DISTRO_FEATURES_lsppchd += "raid"
DISTRO_FEATURES_lsppchg += "raid"
+DISTRO_FEATURES_lsarm += "raid"
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+# This isn't actually in OE yet
+#DISTRO_EXTRA_RDEPENDS = "openlink-machine"
ENABLE_BINARY_LOCALE_GENERATION = "0"
HOTPLUG = "udev"
@@ -42,7 +48,7 @@ require conf/distro/include/sane-srcdates.inc
PREFERRED_VERSION_openlink = "svn"
PREFERRED_VERSION_dtc = "20070216"
PREFERRED_VERSION_dtc-native = "20070216"
-
+PREFERRED_VERSION_udev = "097"
# Various defines for QNAP Turbostation
#FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf
index ad94a0f029..161f3ad8c1 100644
--- a/conf/machine/include/lsppc.conf
+++ b/conf/machine/include/lsppc.conf
@@ -20,6 +20,7 @@ USE_VT = "0"
HOTPLUG = "udev"
udevdir = "/dev"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
IMAGE_FSTYPES = "tar.gz"
#tune for the MPC5200B cpu
diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf
new file mode 100644
index 0000000000..9698fc9a70
--- /dev/null
+++ b/conf/machine/lsarm.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: ARM based Buffalo Linkstation
+#@DESCRIPTION: Machine configuration for various different ARM based linkstations
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+INHERIT += "lsarm-image"
+
+MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+
+TARGET_FPU = "soft"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+USE_DEVFS = "0"
+
+require conf/machine/include/tune-arm926ejs.conf
+
+IMAGE_FSTYPES = "tar.gz"
+
+# serial console port on devboard rev. B3
+SERIAL_CONSOLE = "115200 ttyS0"
+
+HOTPLUG = "udev"
+udevdir = "/dev"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationarm"
+
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index bf59929b02..ac22703de9 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -3,4 +3,6 @@
#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
UBOOT_MACHINE = "linkstation_HDLAN"
IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf \ No newline at end of file
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchd-image"
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 6040010176..9f03febba6 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -3,4 +3,6 @@
#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
UBOOT_MACHINE = "linkstation_HGLAN"
IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf \ No newline at end of file
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchg-image"
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 2acfe812b0..11ec87d205 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -23,5 +23,6 @@ EXTRA_IMAGECMD = "--little-endian"
# Creating an image that works with the webinterface required encrypting it
# So we'll need openssl
EXTRA_IMAGEDEPENDS = "openssl-native"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 2c1a9d70b5..0911dd39af 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -8,6 +8,8 @@ INHERIT += "turbostation-image"
# terminal specs - console, but no other ports
SERIAL_CONSOLE="115200 console"
USE_VT="0"
+MACHINE_EXTRA_RDEPENDS = "u-boot"
+PREFERRED_VERSION_u-boot = "1.2.0"
MODUTILS=26
MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
@@ -20,8 +22,8 @@ MACHINE_TASK_PROVIDER = "task-base"
# We want udev support in the image
udevdir = "/dev"
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x20000"
IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
require conf/machine/include/tune-ppc603e.conf
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index 2e5dcbd086..5effeb8de6 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
LICENSE = "LGPL"
HOMEPAGE = "http://directfb.org"
DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r1"
+PR = "r2"
RV = "1.0-0"
SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
@@ -27,9 +27,14 @@ EXTRA_OECONF = "--with-gfxdrivers=none \
"
do_stage() {
+ autotools_stage_all
+}
+
+do_install() {
oe_runmake 'DESTDIR=${D}' install
}
+
FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
${libdir}/directfb-${RV}/*/.debug/*.so \
"
diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb
index 9f5295bdb2..1695045290 100644
--- a/packages/libxml/libxml2_2.6.26.bb
+++ b/packages/libxml/libxml2_2.6.26.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "GNOME XML Parser library"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "MIT"
-PR = "r2"
+DEPENDS = "libiconv"
+PR = "r3"
SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
diff --git a/packages/uboot/files/u-boot-20060807.tar.bz2 b/packages/uboot/files/u-boot-20060807.tar.bz2
deleted file mode 100644
index 7b35fcfdd1..0000000000
--- a/packages/uboot/files/u-boot-20060807.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/packages/uboot/files/u-boot-20060907.tar.bz2 b/packages/uboot/files/u-boot-20060907.tar.bz2
deleted file mode 100644
index 66b562cafe..0000000000
--- a/packages/uboot/files/u-boot-20060907.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/packages/uboot/u-boot_1.2.0.bb b/packages/uboot/u-boot_1.2.0.bb
index 15d16bd571..5fbce73018 100644
--- a/packages/uboot/u-boot_1.2.0.bb
+++ b/packages/uboot/u-boot_1.2.0.bb
@@ -2,6 +2,8 @@ require u-boot.inc
PR = "r1"
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2"
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2 \
+ "
+SRC_URI_append_turbostation = "file://qnap.diff;patch=1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 19:00:25 +0000