summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf19
-rw-r--r--conf/checksums.ini6
-rw-r--r--conf/distro/angstrom-2007.1.conf6
-rw-r--r--conf/distro/foonas.conf8
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.2.inc1
-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--conf/tinder.conf2
12 files changed, 79 insertions, 12 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index e3608c3ddc..ae26d992f2 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -365,6 +365,25 @@ SRCDATE = "${DATE}"
SRC_URI = "file://${FILE}"
##################################################################
+# UI/Interaction Configuration
+##################################################################
+
+SHELLRCCMD = "bash --rcfile $TERMRCFILE"
+# Some common terminal programs to choose from
+GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"'
+GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x ${SHELLRCCMD}'
+SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"'
+SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} ${SHELLRCCMD}'
+XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"'
+XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e ${SHELLRCCMD}'
+KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"'
+KONSOLE_TERMCMDRUN = '${KCONSOLE_TERMCMD} -e ${SHELLRCCMD}'
+
+# Set a default
+TERMCMD ?= "${GNOME_TERMCMD}"
+TERMCMDRUN ?= "${GNOME_TERMCMDRUN}"
+
+##################################################################
# Miscellaneous utilities.
##################################################################
diff --git a/conf/checksums.ini b/conf/checksums.ini
index f73fc47571..b11c0f9825 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2,9 +2,9 @@
md5=402bdb26356791bd5d277099adacc006
sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7
-[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.tar.gz]
-md5=28d0e78d736748e67f25ad99456f10c3
-sha256=9bccf1240ce9317510eb860e7fcd387be2ddc73adc14451d679a6a7358383772
+[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.1.tar.gz]
+md5=bc6f32759db02cf32a83640d74fb9993
+sha256=cfa9b2d0f9b87a7a524abe149e7207adf86c077749c907342df63126a7ec292d
[http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
md5=85b6a42a9e17a23c01b2f2ed0ece0563
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index ce8d446388..86e87f31d6 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
#DISTRO_VERSION = "2007.4"
DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "40"
+DISTRO_REVISION = "41"
require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
@@ -133,7 +133,7 @@ PREFERRED_VERSION_fontconfig = "2.4.1"
PREFERRED_VERSION_freetype = "2.3.1"
PREFERRED_VERSION_freetype-native = "2.2.1"
PREFERRED_VERSION_cairo = "1.4.2"
-PREFERRED_VERSION_glib-2.0 = "2.12.10"
+PREFERRED_VERSION_glib-2.0 = "2.12.11"
#Small machines prefer kdrive, but we might ship full Xorg in other images
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -198,7 +198,7 @@ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uc
#use EABI toolchain
PREFERRED_VERSION_gcc ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.2"
PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
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/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
index be6813369e..59a481a104 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
@@ -219,6 +219,7 @@ PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1"
PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1"
PREFERRED_VERSION_libsm ?= "1.0.2"
PREFERRED_VERSION_libx11 ?= "1.1.1"
+PREFERRED_VERSION_libx11-native ?= "1.1.1"
PREFERRED_VERSION_libxau ?= "1.0.3"
PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2"
PREFERRED_VERSION_libxcomposite ?= "0.3.1"
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/conf/tinder.conf b/conf/tinder.conf
index 99e263c96c..614ed89400 100644
--- a/conf/tinder.conf
+++ b/conf/tinder.conf
@@ -12,7 +12,7 @@ INHERIT += "tinderclient"
# HTTP posting
#TINDER_HOST = "ewi546.ewi.utwente.nl"
-#TINDER_URL = "/OE_qa/cgi-bin/process_builds.cgi"
+#TINDER_URL = "/tinderbox"
# Which branch do we build
#TINDER_BRANCH = "org.openembedded.dev"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 17:31:39 +0000