diff options
30 files changed, 142 insertions, 482 deletions
diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass index bb150c7e15..cb13222d64 100644 --- a/classes/lsppchd-image.bbclass +++ b/classes/lsppchd-image.bbclass @@ -6,3 +6,5 @@ IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAG lsppchd_pack_image() { : } + +IMAGE_POSTPROCESS_COMMAND += "lsppchd_pack_image; " diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass index 9ad0801fe3..553414224d 100644 --- a/classes/lsppchg-image.bbclass +++ b/classes/lsppchg-image.bbclass @@ -6,3 +6,5 @@ IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAG lsppchg_pack_image() { : } + +IMAGE_POSTPROCESS_COMMAND += "lsppchg_pack_image; " diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass index 393efae7e1..bc6c12e1fb 100644 --- a/classes/n2100-image.bbclass +++ b/classes/n2100-image.bbclass @@ -28,3 +28,5 @@ n2100_pack_image() { rm -f $PADFILE ls -l $OUTPUT } + +IMAGE_POSTPROCESS_COMMAND += "n2100_pack_image; " diff --git a/classes/turbostation-image.bbclass b/classes/turbostation-image.bbclass index e61ffc825b..5a0768c687 100644 --- a/classes/turbostation-image.bbclass +++ b/classes/turbostation-image.bbclass @@ -28,3 +28,5 @@ turbostation_pack_image() { rm -f $PADFILE ls -l $OUTPUT } + +IMAGE_POSTPROCESS_COMMAND += "turbostation_pack_image; " diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 7608e298ab..becad95786 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -1,64 +1,63 @@ -# -# FooNAS distribution - a NAS-centric distribution -# based on openprotium -# - +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: foonas <http://www.foonas.org> +#@DESCRIPTION: A nas-centric distribution +#@MAINTAINER: Øyvind Repvik <repvik@foonas.org> +#@-------------------------------------------------------------------- + +FOONAS_MODE ?= "glibc" +ANGSTROM_MODE = ${FOONAS_MODE} +require conf/distro/angstrom-2007.1.conf + +DISTRO = "foonas" DISTRO_NAME = "foonas" +DISTRO_VERSION = "1.0-dev" +DISTRO_REVISION = "1" +DISTRO_TYPE = "debug" -# 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.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/packages" -FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/kernel" +DISTRO_FEATURES = "uboot redboot" +DISTRO_FEATURES_n2100 += "raid" +DISTRO_FEATURES_storcenter += "raid" +DISTRO_FEATURES_lsppchd += "raid" +DISTRO_FEATURES_lsppchg += "raid" +ENABLE_BINARY_LOCALE_GENERATION = "0" HOTPLUG = "udev" -# Various defines for Thecus N2100 -FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage" -FOONAS_SUPPORT_n2100 += "fis" -BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" +# No room for debug apps on an NSLU2. +DEBUG_APPS = "" + +FEED_URIS = "foonas##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*" +IMAGE_POSTPROCESS_COMMAND += "${MACHINE}_pack_image;" +IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" - -# Various defines for QNAP Turbostation -FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ - kernel-module-usb-storage" -FOONAS_SUPPORT_turbostation += "uboot-utils" -BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" - -# Various defines for Linkstations -FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ - kernel-module-raid0 kernel-module-raid456 \ - kernel-module-multipath" -FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" -FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" -FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} -IMAGE_FSTYPES_lsppchd = "tar.gz" -IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} - -FOONAS_KERNEL_storcenter = "kernel-module-dummy \ - kernel-module-af-packet " -FOONAS_SUPPORT_storcenter = "uboot-utils" - -IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;' +require conf/distro/include/sane-srcdates.inc +PREFERRED_VERSION_openlink = "svn" +PREFERRED_VERSION_dtc = "20070216" +PREFERRED_VERSION_dtc-native = "20070216" -# -# Naming schemes -# -INHERIT += "debian" +# Various defines for QNAP Turbostation +#FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ +# kernel-module-usb-storage" +#FOONAS_SUPPORT_turbostation += "uboot-utils" +#BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" # -# Packaging and output format +# Various defines for Linkstations +#FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ +# kernel-module-raid0 kernel-module-raid456 \ +# kernel-module-multipath" +#FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" +#FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" +#FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} # +#FOONAS_KERNEL_storcenter = "kernel-module-dummy \ +# kernel-module-af-packet " -INHERIT += "package_ipk" -IMAGE_BASENAME = "foonas" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/foonas.inc diff --git a/conf/distro/include/foonas-glibc.inc b/conf/distro/include/foonas-glibc.inc deleted file mode 100644 index 7ad71bf503..0000000000 --- a/conf/distro/include/foonas-glibc.inc +++ /dev/null @@ -1,23 +0,0 @@ -# glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" - -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" - -BUILD_OPTIMIZATION = "-Os" -BUILD_OPTIMIZATION_pn-perl = "-O1" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF = "--with-tls" - diff --git a/conf/distro/include/foonas-uclibc.inc b/conf/distro/include/foonas-uclibc.inc deleted file mode 100644 index 8315341b7e..0000000000 --- a/conf/distro/include/foonas-uclibc.inc +++ /dev/null @@ -1,22 +0,0 @@ -# uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" - -USE_NLS ?= "no" - -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" -CXXFLAGS += "-fvisibility-inlines-hidden" - -SRCDATE_uclibc ?= "20070320" -PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" -PREFERRED_VERSION_uclibc-initial ?= "0.9.28+svn${SRCDATE_uclibc}" - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" -#PREFERRED_VERSION_linux-libc-headers_powerpc = "2.6.15.99"
\ No newline at end of file diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc deleted file mode 100644 index ad020b8501..0000000000 --- a/conf/distro/include/foonas.inc +++ /dev/null @@ -1,54 +0,0 @@ -# -# binutils and compilers -# -# Can be "glibc" and "uclibc" -FOONAS_MODE ?= "glibc" - -#DEPLOY_DIR = "${TMPDIR}/deploy/${FOONAS_MODE}" -require conf/distro/include/foonas-${FOONAS_MODE}.inc - -INHERIT += "package_ipk debian sanity devshell" - -#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-native" -ENABLE_BINARY_LOCALE_GENERATION ?= "0" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate" - -# not used yet -#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" - -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/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" - -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" - -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "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.5" - -PREFERRED_VERSION_openlink = "svn" -PREFERRED_VERSION_dtc = "20070216" -PREFERRED_VERSION_dtc-native = "20070216" diff --git a/conf/machine/include/linkstationppc.conf b/conf/machine/include/lsppc.conf index 620a6931eb..ad94a0f029 100644 --- a/conf/machine/include/linkstationppc.conf +++ b/conf/machine/include/lsppc.conf @@ -5,13 +5,13 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" TARGET_FPU = "hard" +MACHINE_TASK_PROVIDER = "task-base" USE_DEVFS = "0" BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules" -FEED_URIS = "openlink##http://ipkg.linkstationwiki.net/2007.1/powerpc/" PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc" #don't try to access tty1 @@ -20,7 +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 require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index 51d0186dbe..bf59929b02 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -1,8 +1,6 @@ #@TYPE: Machine #@NAME: HD Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD - UBOOT_MACHINE = "linkstation_HDLAN" IMAGE_FSTYPES = "tar.gz" - -require conf/machine/include/linkstationppc.conf +require conf/machine/include/lsppc.conf
\ No newline at end of file diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index 516a3aaa98..6040010176 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -1,8 +1,6 @@ #@TYPE: Machine #@NAME: HG Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG - UBOOT_MACHINE = "linkstation_HGLAN" IMAGE_FSTYPES = "tar.gz" - -require conf/machine/include/linkstationppc.conf +require conf/machine/include/lsppc.conf
\ No newline at end of file diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index c84bf352da..2acfe812b0 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -3,11 +3,13 @@ TARGET_OS = "linux" TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +INHERIT += "n2100-image" + SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index bb7c8f1bef..ea59349c07 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -2,14 +2,15 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_TASK_PROVIDER = "task-base" + +INHERIT += "storcenter-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index ffa44207cd..2c1a9d70b5 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -2,14 +2,18 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_TASK_PROVIDER = "task-base" + +INHERIT += "turbostation-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" +UBOOT_MACHINE = "qnap_config" +PREFERRED_VERSION_u-boot = "1.2.0" + PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" MACHINE_TASK_PROVIDER = "task-base" diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb deleted file mode 100644 index 8e219880d0..0000000000 --- a/packages/dri/drm_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/base" -LICENSE = "MIT" -SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver" - -PV = "0.0+cvs${SRCDATE}" -PR = "r3" - -S = "${WORKDIR}/drm" - -inherit autotools pkgconfig - -do_compile() { - oe_runmake -C libdrm -} - -do_stage() { - autotools_stage_all -} diff --git a/packages/foonas-init/files/initscripts/fixfstab b/packages/foonas-init/files/initscripts/fixfstab deleted file mode 100644 index 67116a12fd..0000000000 --- a/packages/foonas-init/files/initscripts/fixfstab +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# validate /etc/fstab against the current UUID list in -# /etc/uuid_by_partition -# -. /etc/default/functions -pfile=/etc/uuid_by_partition - -# -# use debug to find out what is going on -test "$1" = start -o "$1" = debug || exit 0 - -# -# obtain the current list of parititions with UUIDs -newlist="$(uuid_by_partition)" - -if test -r "$pfile" -then - # read the old list - oldlist="$(cat "$pfile")" - # - # if it hasn't changed nothing need be done - test "$newlist" = "$oldlist" && exit 0 - # - # it has changed, but this only matters if - # a previously existing uuid has moved, build - # a list of old device vs new device for every - # uuid which has moved - changedlist="$( - { echo "$oldlist" - echo "$newlist" - } | awk 'device[$2] == ""{device[$2] = $1} - device[$2] != $1{print device[$2], $1}')" - - if test -n "$changedlist" - then - # at least one partition has moved, scan the - # current fstab to see if it has a reference - # to this partition - changedfstab="$( - { echo "$changedlist" - echo '#fstab' - cat /etc/fstab - } | awk 'BEGIN{list=1} - list==1 && $0=="#fstab"{list=0; continue} - list==1{new[$1] = $2; continue} - new[$1] != ""{print $1, new[$1]}')" - - # if this list is not empty edit the fstab - if test -n "$changedfstab" - then - rm -f /tmp/fstab.$$ - # if the edit fails then do not overwrite the old - # partition list - just exit with an error - { echo "$changedlist" - echo '#fstab' - cat /etc/fstab - } | awk 'BEGIN{list=1} - list==1 && $0=="#fstab"{list=0; continue} - list==1{new[$1] = $2; continue} - new[$1] != ""{$1 = new[$1]} - {print}' >/tmp/fstab.$$ || { - if test "$1" = start - then - logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: awk failed" - else - echo "debug: awk script failed with:" >&2 - echo "$changedlist" >&2 - echo "output in /tmp/fstab.$$" >&2 - fi - exit 1 - } - - if test "$1" = start - then - mv /tmp/fstab.$$ /etc/fstab || { - logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: update failed" - exit 1 - } - else - echo "debug: fstab changed:" - diff -u /etc/fstab /tmp/fstab.$$ - fi - fi - fi -fi - -# write the new list to the file, only if we -# are doing something... -test "$1" = start && echo "$newlist" >"$pfile" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/loadmodules.sh b/packages/foonas-init/files/initscripts/loadmodules.sh deleted file mode 100644 index c5d44d1067..0000000000 --- a/packages/foonas-init/files/initscripts/loadmodules.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -. /etc/default/modulefunctions # Load module loading logic - -loadnetmods - -loaddiskmods - -loadmiscmods - -exit 0 diff --git a/packages/foonas-init/files/initscripts/rmrecovery b/packages/foonas-init/files/initscripts/rmrecovery deleted file mode 100644 index eec822b154..0000000000 --- a/packages/foonas-init/files/initscripts/rmrecovery +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Run to remove /.recovery if the boot seems to have succeeded -test -e /.recovery && rm -f /.recovery -exit 0 diff --git a/packages/foonas-init/files/initscripts/sysconfsetup b/packages/foonas-init/files/initscripts/sysconfsetup deleted file mode 100644 index a4f9074d9c..0000000000 --- a/packages/foonas-init/files/initscripts/sysconfsetup +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# This script is run once when the system first boots. Its sole -# purpose is to create /etc/default/sysconf (the overall system -# configuration file) and other files derived from this. -# -# The script runs immediately after S10checkroot.sh - this is the -# point at which the rootfs will be mounted rw even if the kernel -# booted with it ro. -# -# rm or mv the file (/etc/default/sysconf) to recreate it, run this -# script with the reload option to overwrite the system files. The -# configuration files described in sysconf_reload (in -# /sbin/sysconf) will be overwritten on reload. -# -# start: standard startup, do a complete (auto) restore if necessary -# reinit: always do a complete auto restore -# reload: just reload sysconf (no config files!) -# -# /etc/default/functions contains useful utility functions - it's -# in a separate file so that it can be loaded by any script -. /etc/default/functions -load_functions sysconf || exit 1 -# -case "$1" in -start) test -s /etc/default/sysconf || { - if sysconf_read - then - if sysconf_valid - then - sysconf_restore auto - else - sysconf_reload - fi - else - sysconf_default - sysconf_reload - fi - };; - -reload) test -s /etc/default/sysconf || sysconf_read || sysconf_default - sysconf_reload;; - -reinit) sysconf_restore auto;; - -*) ;; -esac diff --git a/packages/foonas-init/files/initscripts/syslog.buffer b/packages/foonas-init/files/initscripts/syslog.buffer deleted file mode 100644 index 9285c02946..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.buffer +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses (only) 'buffer' as the DESTINATION -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= - -for d in $DESTINATION -do - case "$d" in - buffer) doit=1;; - file) exit 0;; - remote) exit 0;; - *) echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -test -n "$doit" -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/syslog.file b/packages/foonas-init/files/initscripts/syslog.file deleted file mode 100644 index 80ee5f0174..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.file +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses 'file' (and, optionally, buffer) as the DESTINATION -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= - -for d in $DESTINATION -do - case "$d" in - buffer) :;; - file) doit=1;; - remote) exit 0;; - *) echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -test -n "$doit" -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/syslog.network b/packages/foonas-init/files/initscripts/syslog.network deleted file mode 100644 index 3d7f4ab8e6..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.network +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses 'remote', or doesn't use 'buffer' or 'file' -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= -doneit= - -for d in $DESTINATION -do - case "$d" in - buffer) doneit=1;; - file) doneit=1;; - remote) doit=1;; - *) doit=1 - echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -# One of doneit or doit is set unless the DESTINATION value -# is empty (which is probably an error), let syslog handle -# the error. -test \( -n "$doit" -o -z "$doneit" \) -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/umountinitrd.sh b/packages/foonas-init/files/initscripts/umountinitrd.sh deleted file mode 100644 index b590ae68b5..0000000000 --- a/packages/foonas-init/files/initscripts/umountinitrd.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# umount /mnt, which is where the initrd ends up mounted -# if the directory /initrd is not present, if this fails -# then the /initrd is mounted and we want to remount that -# ro - this works round the shutdown -r hang problem -. /etc/default/functions -# -# if we are turnup'ed to disk, then just unmount the initrd all together -# -if [ -e /initrd/dev/.devfsd ]; then - [ "$VERBOSE" = "very" ] && echo "Unmounting initrd..." - umount /initrd/dev - umount /initrd - exit 0 -fi - -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 - if test -n "$ffsdev" -a -b "$ffsdev" - then - mount -o remount,ro "$ffsdev" /initrd - else - echo "Flashdisk: $ffsdev: flash device not found" >&2 - fi;; - esac -done </proc/mounts diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb deleted file mode 100644 index 8dc2370b5e..0000000000 --- a/packages/images/foonas-image.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Foonas image" -LICENSE = "GPL" -PR = "r0" - -inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image - -DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" - -EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" -IMAGE_LINGUAS = "" - -RDEPENDS = " \ - base-files base-passwd netbase \ - busybox initscripts foonas-init \ - update-modules sysvinit tinylogin \ - module-init-tools-depmod modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ - libgcc1 diffutils cpio findutils\ - dropbear e2fsprogs-blkid \ - mdadm hdparm mtd-utils udev \ - ${FOONAS_SUPPORT} \ - ${FOONAS_KERNEL} " - -PACKAGE_INSTALL = "${RDEPENDS}" - diff --git a/packages/opie-init/opie-init_cvs.bb b/packages/opie-init/opie-init_1.2.2.bb index b45baeb5ae..271ff62e51 100644 --- a/packages/opie-init/opie-init_cvs.bb +++ b/packages/opie-init/opie-init_1.2.2.bb @@ -1,5 +1,4 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" PR = "r0" SRC_URI = "file://opie-reorgfiles \ diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 4d16501d6b..17fc9a30f5 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r21" +PR = "r20" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -38,9 +38,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # irda # pci # pcmcia +# redboot +# uboot # usbgadget # usbhost + DISTRO_CORE_PACKAGE ?= "task-base-core-default" # @@ -62,9 +65,12 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ + ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" @@ -247,6 +253,12 @@ task-base-usbhost-rrecommends = "\ kernel-module-usbserial \ kernel-module-usb-storage " +task-base-uboot-rdepends = "\ + uboot-utils" + +task-base-redboot-rdepends = "\ + fis" + task-distro-ppp-rdepends = "\ ppp \ ppp-dialin" @@ -293,6 +305,8 @@ task-distro-nfs-rrecommends = "\ kernel-module-lockd \ kernel-module-sunrpc" +task-distro-raid-rdepends = "\ + " # Tosort # kernel-module-ipv6 diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config deleted file mode 100644 index 97ce8a87d4..0000000000 --- a/packages/uboot-utils/files/turbostation/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/saveenv) utility. -# Up to two entries are valid, in this case the redundand -# environment sector is assumed present. - -# MTD device name Device offset Env. size Flash sector size - -# Primary U-Boot environment. You shouldn't need to touch this. If you touch this, -# you should be *very* sure about what you're doing if you don't have a serial -# cable attached! -# /dev/mtd4 0x00000 0x20000 0x20000 - -# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily -# render your turbostation unbootable! - -/dev/mtd5 0x00000 0x20000 0x20000
\ No newline at end of file diff --git a/packages/uboot/uboot-utils_1.1.2.bb b/packages/uboot/uboot-utils_1.1.2.bb new file mode 100644 index 0000000000..8a5d7dce3c --- /dev/null +++ b/packages/uboot/uboot-utils_1.1.2.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "mtd-utils" +PR = "r5" + +SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ + file://fw_env.c.patch;patch=1 \ + file://tools-Makefile.patch;patch=1 \ + file://env-Makefile.patch;patch=1 \ + file://fw_env.config" + +S = "${WORKDIR}/u-boot-${PV}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +UBOOT_MACHINE ?= "${MACHINE}_config" + +inherit base + +do_configure() { + : +} + +do_compile () { + oe_runmake Sandpoint8240_config + oe_runmake tools +} + +# install mkimage for the kernel makefile +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/ +} + +do_install () { + install -d ${D}/sbin + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv +} diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb new file mode 100644 index 0000000000..64e0550571 --- /dev/null +++ b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" + +SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ + file://unbreak_cross_compile.patch;patch=1 " + +S = "${WORKDIR}/util-macros-1.1.5" + +inherit native autotools pkgconfig + diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index fcfec6d4f7..634d6eb835 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -8,7 +8,7 @@ PROVIDES = "virtual/xserver" MESA_VER ?= "6.5" DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ -xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ +xf86driproto libdrm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ |