[oe-commits] org.oe.dev remove openturbostation distro, add foonas
nail commit
openembedded-commits at lists.openembedded.org
Fri Mar 9 21:43:01 UTC 2007
remove openturbostation distro, add foonas
Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: a3a6b606f8696b6f5cbfbee341c9dd0a91033a49
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a3a6b606f8696b6f5cbfbee341c9dd0a91033a49
Files:
1
conf/distro/openturbostation.conf
packages/images/openturbostation-image.bb
packages/meta/openturbostation-packages.bb
packages/openturbostation-init
packages/openturbostation-init/files
packages/openturbostation-init/files/boot
packages/openturbostation-init/files/boot/disk
packages/openturbostation-init/files/boot/flash
packages/openturbostation-init/files/boot/network
packages/openturbostation-init/files/boot/nfs
packages/openturbostation-init/files/boot/udhcpc.script
packages/openturbostation-init/files/conffiles
packages/openturbostation-init/files/functions
packages/openturbostation-init/files/initscripts
packages/openturbostation-init/files/initscripts/fixfstab
packages/openturbostation-init/files/initscripts/loadmodules.sh
packages/openturbostation-init/files/initscripts/rmrecovery
packages/openturbostation-init/files/initscripts/sysconfsetup
packages/openturbostation-init/files/initscripts/syslog.buffer
packages/openturbostation-init/files/initscripts/syslog.file
packages/openturbostation-init/files/initscripts/syslog.network
packages/openturbostation-init/files/initscripts/umountinitrd.sh
packages/openturbostation-init/files/links.conf
packages/openturbostation-init/files/modulefunctions
packages/openturbostation-init/files/reflash
packages/openturbostation-init/files/sysconf
packages/openturbostation-init/files/turnup
packages/openturbostation-init/openturbostation-init_0.10.bb
packages/foonas-init
packages/foonas-init/files
packages/foonas-init/files/boot
packages/foonas-init/files/initscripts
conf/distro/foonas.conf
packages/foonas-init/files/boot/disk
packages/foonas-init/files/boot/flash
packages/foonas-init/files/boot/network
packages/foonas-init/files/boot/nfs
packages/foonas-init/files/boot/udhcpc.script
packages/foonas-init/files/conffiles
packages/foonas-init/files/functions
packages/foonas-init/files/initscripts/fixfstab
packages/foonas-init/files/initscripts/loadmodules.sh
packages/foonas-init/files/initscripts/rmrecovery
packages/foonas-init/files/initscripts/sysconfsetup
packages/foonas-init/files/initscripts/syslog.buffer
packages/foonas-init/files/initscripts/syslog.file
packages/foonas-init/files/initscripts/syslog.network
packages/foonas-init/files/initscripts/umountinitrd.sh
packages/foonas-init/files/links.conf
packages/foonas-init/files/modulefunctions
packages/foonas-init/files/reflash
packages/foonas-init/files/sysconf
packages/foonas-init/files/turnup
packages/foonas-init/foonas-init_0.10.bb
packages/images/foonas-image.bb
packages/meta/foonas-packages.bb
conf/machine/turbostation.conf
packages/images/openprotium-image.bb
packages/linux/linux-turbostation_2.6.20.1.bb
Diffs:
#
# mt diff -r5a015d1c49983568aacf29859d863463069aca15 -ra3a6b606f8696b6f5cbfbee341c9dd0a91033a49
#
#
#
# delete "conf/distro/openturbostation.conf"
#
# delete "packages/images/openturbostation-image.bb"
#
# delete "packages/meta/openturbostation-packages.bb"
#
# delete "packages/openturbostation-init"
#
# delete "packages/openturbostation-init/files"
#
# delete "packages/openturbostation-init/files/boot"
#
# delete "packages/openturbostation-init/files/boot/disk"
#
# delete "packages/openturbostation-init/files/boot/flash"
#
# delete "packages/openturbostation-init/files/boot/network"
#
# delete "packages/openturbostation-init/files/boot/nfs"
#
# delete "packages/openturbostation-init/files/boot/udhcpc.script"
#
# delete "packages/openturbostation-init/files/conffiles"
#
# delete "packages/openturbostation-init/files/functions"
#
# delete "packages/openturbostation-init/files/initscripts"
#
# delete "packages/openturbostation-init/files/initscripts/fixfstab"
#
# delete "packages/openturbostation-init/files/initscripts/loadmodules.sh"
#
# delete "packages/openturbostation-init/files/initscripts/rmrecovery"
#
# delete "packages/openturbostation-init/files/initscripts/sysconfsetup"
#
# delete "packages/openturbostation-init/files/initscripts/syslog.buffer"
#
# delete "packages/openturbostation-init/files/initscripts/syslog.file"
#
# delete "packages/openturbostation-init/files/initscripts/syslog.network"
#
# delete "packages/openturbostation-init/files/initscripts/umountinitrd.sh"
#
# delete "packages/openturbostation-init/files/links.conf"
#
# delete "packages/openturbostation-init/files/modulefunctions"
#
# delete "packages/openturbostation-init/files/reflash"
#
# delete "packages/openturbostation-init/files/sysconf"
#
# delete "packages/openturbostation-init/files/turnup"
#
# delete "packages/openturbostation-init/openturbostation-init_0.10.bb"
#
# add_dir "packages/foonas-init"
#
# add_dir "packages/foonas-init/files"
#
# add_dir "packages/foonas-init/files/boot"
#
# add_dir "packages/foonas-init/files/initscripts"
#
# add_file "conf/distro/foonas.conf"
# content [46c07f05683f85839652fd725a2d74d732e69287]
#
# add_file "packages/foonas-init/files/boot/disk"
# content [9013d8fc4ac2debd474c52e9d86794b9d64cca74]
#
# add_file "packages/foonas-init/files/boot/flash"
# content [ac150c76696ab08f8ea6c6ec70514977285bf5bf]
#
# add_file "packages/foonas-init/files/boot/network"
# content [7863638b33cded9710583ad3868e24dc35c04195]
#
# add_file "packages/foonas-init/files/boot/nfs"
# content [eb5efe23bc1d0b1f6e0dc29f7cb0aec3604ad5c5]
#
# add_file "packages/foonas-init/files/boot/udhcpc.script"
# content [1ed51b781d5c54d52e082e536643650391d1adef]
#
# add_file "packages/foonas-init/files/conffiles"
# content [f1ace3f1649eab164c7a09a2b6e017f748b39dfa]
#
# add_file "packages/foonas-init/files/functions"
# content [003b4788d876a4e0821dd8f6c37330655763f20c]
#
# add_file "packages/foonas-init/files/initscripts/fixfstab"
# content [6ad84d3f2c2390442eedd0de77d2b942fd823692]
#
# add_file "packages/foonas-init/files/initscripts/loadmodules.sh"
# content [65850cc8bc415b6ddf67c8fca195698d565ed12b]
#
# add_file "packages/foonas-init/files/initscripts/rmrecovery"
# content [981d670242c4af8a2e143c4edc0673f08f0379ce]
#
# add_file "packages/foonas-init/files/initscripts/sysconfsetup"
# content [a7c4367f43c69e64b0f6b9ef2706f7f68a08b9e3]
#
# add_file "packages/foonas-init/files/initscripts/syslog.buffer"
# content [bec2ff9c7eb754176df297d6064c455b6762c0f4]
#
# add_file "packages/foonas-init/files/initscripts/syslog.file"
# content [80c43d8ea5fd111a047c968bec660a1e86c3a054]
#
# add_file "packages/foonas-init/files/initscripts/syslog.network"
# content [f9ef95e6aa2e648d0ceecbef03fbd07235a77ca3]
#
# add_file "packages/foonas-init/files/initscripts/umountinitrd.sh"
# content [09230709c6200572b1fc888fa27f570433601bc1]
#
# add_file "packages/foonas-init/files/links.conf"
# content [cbb6d9498021f0bd16cc118462c107fe022805fd]
#
# add_file "packages/foonas-init/files/modulefunctions"
# content [dee4339028f8485586183b3eb1b3300e6c56a424]
#
# add_file "packages/foonas-init/files/reflash"
# content [018401591f5718096bd756a8fb455c9a921e263c]
#
# add_file "packages/foonas-init/files/sysconf"
# content [4ce6fa9ab9b9c0186e446756897a03129a5ce7ef]
#
# add_file "packages/foonas-init/files/turnup"
# content [1284c9014511c5b14c9334d8119b11b52fbe5f23]
#
# add_file "packages/foonas-init/foonas-init_0.10.bb"
# content [c60dc0bdb01bcdcbd5d0576d31a0bff0694fb759]
#
# add_file "packages/images/foonas-image.bb"
# content [6b18c65f018fb6b464ee07fe97758e6e19a57a4d]
#
# add_file "packages/meta/foonas-packages.bb"
# content [2604f282f459f734f13931d1a9ad4cd23c2a6f3d]
#
# patch "conf/machine/turbostation.conf"
# from [7bc4fe59e90ff2d29c2df57d934a78a5d45b683b]
# to [ac38d08023141a5f8dcf18de05f7309bd73c9644]
#
# patch "packages/images/openprotium-image.bb"
# from [b4b50441b7120ae285711264a6fdba8d1c65c3dd]
# to [b8fcbe3a228e05dae5d6343193ed4e38dbaf367d]
#
# patch "packages/linux/linux-turbostation_2.6.20.1.bb"
# from [eed58f064f292a7388bf1e57065ec3c1b79a8e74]
# to [b2617f037dbbfb156bfe692495f28bdec36ec4d5]
#
============================================================
--- conf/distro/foonas.conf 46c07f05683f85839652fd725a2d74d732e69287
+++ conf/distro/foonas.conf 46c07f05683f85839652fd725a2d74d732e69287
@@ -0,0 +1,67 @@
+#
+# FooNAS distribution - a NAS-centric distribution
+# based on openprotium
+#
+
+DISTRO_NAME = "foonas"
+
+# This is only changed for a release
+DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+DISTRO_TYPE = "alpha"
+# These should be merged once the bogofeed change has been committed.
+FEED_URIS = "foonas-packages##http://ipkg.kynisk.com/foonas/${MACHINE}/cross/1.0-dev/packages"
+FEED_URIS += "foonas-kernel##http://ipkg.kynisk.com/foonas/{MACHINE}/cross/1.0-dev/kernel"
+
+#
+# Naming schemes
+#
+INHERIT += "debian"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_BASENAME = "foonas"
+IMAGE_FSTYPES = "jffs2"
+
+#
+# binutils and compilers
+#
+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"
+#conflict between this and the last below.
+#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+# Select 2.6 versions of the depmod support
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate"
+
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+
+PREFERRED_VERSION_binutils = "2.16"
+PREFERRED_VERSION_binutils-cross = "2.16"
+
+PREFERRED_VERSION_gcc = "4.1.2"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+PREFERRED_VERSION_glibc-initial = "2.3.2"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+#
+# Target OS
+#
+USE_NLS ?= "no"
+TARGET_OS = "linux"
+HOTPLUG = "udev"
+require conf/distro/include/sane-srcdates.inc
+
+CMDLINE_DEBUG = "noirqdebug"
============================================================
--- packages/foonas-init/files/boot/disk 9013d8fc4ac2debd474c52e9d86794b9d64cca74
+++ packages/foonas-init/files/boot/disk 9013d8fc4ac2debd474c52e9d86794b9d64cca74
@@ -0,0 +1,67 @@
+#!/bin/sh
+# boot from the hard disk partition "$1" (which
+# must be given) using options from the rest of
+# the command line.
+#
+# Use the standard init path (see /etc/init.d/rcS)
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+#
+# Load the helper functions
+. /etc/default/functions
+. /etc/default/modulefunctions
+#
+#
+if test -n "$1"
+then
+ device="$1"
+ shift
+ # proc is needed for UUID mount and module load
+ mount -t proc proc /proc
+ # load USB & SCSI storage modules (/proc required!)
+ if [ "$(machine)" != "storcenter" ]; then
+ echo "boot: loading modules required for disk boot"
+ loaddiskmods
+ # waiting for disk (FIXME)
+ sleep=6
+ test "$sleep" -gt 0 && sleep "$sleep"
+ else
+ # make the device links so turnup can use short disk names.
+ # probably only necessary on devfs based systems.
+ /etc/init.d/devices start
+ scc -l redflash -f auto
+ fi
+ #
+ # fire the boot
+ echo "boot: rootfs: mount $* $device [$UUID]"
+ #
+ # Mount read-write because before exec'ing init
+ # If a UUID is given (in the environment) this
+ # is used in preference to the device, but if
+ # the UUID mount fails a standard device mount
+ # is attempted.
+ if test -n "$UUID" &&
+ mount "$@" -U "$UUID" /mnt ||
+ mount "$@" "$device" /mnt
+ then
+ # checkmount checks for sh, chroot, init
+ # and /mnt (i.e. /mnt/mnt in this case)
+ if checkmount /mnt
+ then
+ # if mounted, then move /dev to the new root
+ mount --bind /dev /mnt/dev
+ # pivot to /initrd if available, else /mnt
+ cd /
+ if test -d /mnt/initrd
+ then
+ swivel mnt initrd
+ else
+ swivel mnt mnt
+ fi
+ # swivel failed
+ fi
+ # Failure: unmount the partition
+ umount /mnt
+ fi
+fi
+# fallback - use the flash boot
+exec /boot/flash
============================================================
--- packages/foonas-init/files/boot/flash ac150c76696ab08f8ea6c6ec70514977285bf5bf
+++ packages/foonas-init/files/boot/flash ac150c76696ab08f8ea6c6ec70514977285bf5bf
@@ -0,0 +1,13 @@
+#!/bin/sh
+# boot from the current (flash) root partition
+# nothing need be done apart from setting the
+# system LED status correctly
+. /etc/default/functions
+scc -l redflash -f auto
+test -x /sbin/init && exec /sbin/init
+# fallback if /sbin/init has been deleted (bad!)
+scc -l red
+exec <>/dev/console >&0 2>&0
+test -x /sbin/sulogin && exec /sbin/sulogin
+test -x /bin/sh && exec /bin/sh
+exit 1
============================================================
--- packages/foonas-init/files/boot/network 7863638b33cded9710583ad3868e24dc35c04195
+++ packages/foonas-init/files/boot/network 7863638b33cded9710583ad3868e24dc35c04195
@@ -0,0 +1,16 @@
+#!/bin/sh
+# bring up the network before boot, used to allow
+# netconsole logging and NFS boot. This runs out
+# of flash, but that's ok because the script doesn't
+# leave any process running.
+#
+# NOTE: /etc/default/functions defines ifup as a shell
+# function!
+. /etc/default/functions
+#
+# Now all the information for booting should be in the configuration
+# file. Config the loopback and network interfaces.
+ifconfig lo 127.0.0.1 up
+iface="$(config iface)"
+test -n "$iface" && ifup "$iface"
+# exit code is true only if the interface config has succeeded
============================================================
--- packages/foonas-init/files/boot/nfs eb5efe23bc1d0b1f6e0dc29f7cb0aec3604ad5c5
+++ packages/foonas-init/files/boot/nfs eb5efe23bc1d0b1f6e0dc29f7cb0aec3604ad5c5
@@ -0,0 +1,19 @@
+#!/bin/sh
+# boot from the nfs partition "$1" (which
+# must be given) using options from the rest of
+# the command line.
+#
+# Use the standard init path (see /etc/init.d/rcS)
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+#
+. /etc/default/functions
+scc -l redflash -f auto
+#
+if /boot/network
+then
+ # network is up and running, the NFS mount will
+ # now succeed (possibly), use /boot/disk
+ exec /boot/disk "$@"
+fi
+# fallback - use the flash boot
+exec /boot/flash
============================================================
--- packages/foonas-init/files/boot/udhcpc.script 1ed51b781d5c54d52e082e536643650391d1adef
+++ packages/foonas-init/files/boot/udhcpc.script 1ed51b781d5c54d52e082e536643650391d1adef
@@ -0,0 +1,17 @@
+#!/bin/sh
+# executed by udhcpc to do the real work of configuring an interface
+# writes the result (if any) to file descriptor 9
+case "$1" in
+deconfig) # ignored
+ :;;
+renew|bound) # this gives the real information
+ test -n "$ip" && {
+ echo "ip='$ip'"
+ echo "subnet='$subnet'"
+ echo "broadcast='$broadcast'"
+ echo "router='$router'"
+ } >&9;;
+leasefail) # ignore - probably no dhcp server
+ :;;
+*) echo "udhcpc: $*: command not recognised" >&2;;
+esac
============================================================
--- packages/foonas-init/files/conffiles f1ace3f1649eab164c7a09a2b6e017f748b39dfa
+++ packages/foonas-init/files/conffiles f1ace3f1649eab164c7a09a2b6e017f748b39dfa
@@ -0,0 +1,55 @@
+# conffiles
+# Known SlugOS configuration files. These files are preserved on
+# a flash upgrade. Other configuration files, found from:
+#
+# /usr/lib/ipkg/*.conffiles
+# /etc/*.conf
+#
+# are preserved too with an operation of 'diff' if they have been
+# changed since /etc/.configured was created.
+#
+# Lines starting with # are comments, other lines have
+# two fields:
+#
+# operation file
+#
+# The file must *NOT* have a leading /
+#
+# operation may be:
+# ignore Do not preserve this file
+# preserve Preserve this file unconditionally
+# diff Compare file with the new version, ask if different
+#
+preserve linuxrc
+preserve etc/.configured
+preserve etc/TZ
+diff etc/default/conffiles
+diff etc/default/devpts
+preserve etc/default/rcS
+preserve etc/default/sysconf
+diff etc/default/usbd
+preserve etc/defaultdomain
+preserve etc/dropbear/dropbear_dss_host_key
+preserve etc/dropbear/dropbear_rsa_host_key
+preserve etc/ssh/ssh_host_dsa_key
+preserve etc/ssh/ssh_host_dsa_key.pub
+preserve etc/ssh/ssh_host_rsa_key
+preserve etc/ssh/ssh_host_rsa_key.pub
+preserve etc/fstab
+preserve etc/group
+preserve etc/gshadow
+preserve etc/hostname
+preserve etc/hosts
+preserve etc/localtime
+ignore etc/modules
+ignore etc/modules.conf
+preserve etc/motd
+preserve etc/network/interfaces
+preserve etc/ntp.drift
+preserve etc/passwd
+preserve etc/profile
+preserve etc/resolv.conf
+preserve etc/shadow
+preserve etc/syslog.conf
+preserve etc/timezone
+preserve root/.ssh/authorized_keys
============================================================
--- packages/foonas-init/files/functions 003b4788d876a4e0821dd8f6c37330655763f20c
+++ packages/foonas-init/files/functions 003b4788d876a4e0821dd8f6c37330655763f20c
@@ -0,0 +1,413 @@
+#!/bin/sh
+# . this file to load the following utility functions
+#
+# hardware
+# the 'Hardware' string from cpuinfo, or, if not found
+# try a little harder with 'machine'
+hardware(){
+ local hdw
+ hdw=`sed -n 's!^Hardware *: !!p' /proc/cpuinfo`
+ test -n "$hdw" || {
+ hdw=`sed -n 's!^machine *: !!p' /proc/cpuinfo`
+ }
+ echo $hdw
+}
+#
+# machine
+# outputs an identifier of the current machine - i.e. the board
+# slugos is running on.
+machine(){
+ case "$(hardware)" in
+ *Coyote*) echo coyote;;
+ *IXDPG425*) echo ixdpg425;;
+ *WRV54G*) echo wrv54g;;
+ *IXDP425*) echo ixdp425;;
+ *IXDP465*) echo ixdp465;;
+ *IXCDP1100*) echo ixcdp1100*;;
+ *Avila*) echo avila;;
+ *Loft*) echo loft;;
+ *NAS?100d*) echo nas100d;;
+ *NSLU2*) echo nslu2;;
+ *StorCenter*) echo storcenter;;
+ *) echo unknown;;
+ esac
+}
+#
+# single_user_ok
+# if the machine is capable of single user interaction return
+# true, else return false. The result of this function is
+# preempted by setting SULOGIN to 'yes' or 'ok' in /etc/default/rcS
+single_user_ok() {
+ # list known good machines in the 'case'
+ test "$SULOGIN" = yes -o "$SULOGIN" = ok ||
+ case "$(machine)" in
+ ixdp*|avila|loft)
+ test "$SULOGIN" != never;;
+ *) return 1;;
+ esac
+}
+#
+# load_functions "source"
+# load the functions in '/sbin/source' - relies on /sbin/source being
+# a shell script and having support for this function.
+load_functions(){
+ test -n "$1" -a -x "/sbin/$1" && . "/sbin/$1" || {
+ echo "$0: /sbin/$1: script not found" >&2
+ return 1
+ }
+}
+#
+# mtdev "name"
+# return (output) the character device name for flash parition "name"
+# /proc/mtd has the general form:
+# dev: size erasesize name
+# mtd5: 00020000 00020000 "FIS directory"
+# use this rather than hard-wiring the device because the partition
+# table can change - looking in /proc/mtd is more reliable.
+mtdev(){
+ if test $(machine) = storcenter ; then
+ sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtd/\1!p' /proc/mtd
+ else
+ sed -n 's!^\(mtd[0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/\1!p' /proc/mtd
+ f%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list