From 11596b065278a600dd829020447219cdb4768df7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 Mar 2007 15:57:51 +0000 Subject: openmoko: we use GTK not GTK-DirectFB --- conf/distro/include/openmoko.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 168d9bb6a2..4c728e1922 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -89,6 +89,20 @@ PREFERRED_VERSION_gtk-engines = "2.6.5" PREFERRED_VERSION_fontconfig = "2.4.1" +# we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" # # GPE # -- cgit v1.2.3 From c88750093b1ea4da88fc703d9e0677603777cae5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 Mar 2007 18:02:03 +0000 Subject: site/*: move mr_cv_target_elf to common as all our targets are ELF systems - this also make libelf buildable --- site/arm-linux | 1 - site/arm-linux-uclibc | 2 -- site/armeb-linux | 2 -- site/armeb-linux-uclibc | 2 -- site/common | 2 ++ site/powerpc-linux | 2 -- site/powerpc-linux-uclibc | 2 -- site/sh-common | 2 -- site/sparc-linux | 2 -- site/x86_64-linux | 1 - site/x86_64-linux-uclibc | 1 - 11 files changed, 2 insertions(+), 17 deletions(-) diff --git a/site/arm-linux b/site/arm-linux index ceebbecf6b..89a0eef0ed 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -38,7 +38,6 @@ ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # samba diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc index 3ebf6f4d6c..81d2c54aae 100644 --- a/site/arm-linux-uclibc +++ b/site/arm-linux-uclibc @@ -23,8 +23,6 @@ ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # samba diff --git a/site/armeb-linux b/site/armeb-linux index fd3d2b18d3..1b170ab191 100644 --- a/site/armeb-linux +++ b/site/armeb-linux @@ -26,8 +26,6 @@ ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # samba diff --git a/site/armeb-linux-uclibc b/site/armeb-linux-uclibc index 3b2bc6b0e5..1ab44977dd 100644 --- a/site/armeb-linux-uclibc +++ b/site/armeb-linux-uclibc @@ -26,8 +26,6 @@ ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # samba diff --git a/site/common b/site/common index e69de29bb2..f73a36abed 100644 --- a/site/common +++ b/site/common @@ -0,0 +1,2 @@ +# libelf +mr_cv_target_elf=${mr_cv_target_elf=yes} diff --git a/site/powerpc-linux b/site/powerpc-linux index dd2c811706..92dd1fd9d0 100644 --- a/site/powerpc-linux +++ b/site/powerpc-linux @@ -33,8 +33,6 @@ ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} diff --git a/site/powerpc-linux-uclibc b/site/powerpc-linux-uclibc index 97e425f35c..5bdc913652 100644 --- a/site/powerpc-linux-uclibc +++ b/site/powerpc-linux-uclibc @@ -28,8 +28,6 @@ ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_c_littleendian=${ac_cv_c_littleendian=no} ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} diff --git a/site/sh-common b/site/sh-common index 7165542ebe..76c464da20 100644 --- a/site/sh-common +++ b/site/sh-common @@ -30,8 +30,6 @@ ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # apache diff --git a/site/sparc-linux b/site/sparc-linux index c717ebffab..491dc74bf4 100644 --- a/site/sparc-linux +++ b/site/sparc-linux @@ -35,8 +35,6 @@ ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} ac_cv_ushort=${ac_cv_ushort=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} - ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} diff --git a/site/x86_64-linux b/site/x86_64-linux index 86ae6231ba..e84371e0fd 100644 --- a/site/x86_64-linux +++ b/site/x86_64-linux @@ -62,7 +62,6 @@ glib_cv___va_copy=${glib_cv___va_copy=yes} glib_cv_va_copy=${glib_cv_va_copy=yes} glib_cv_va_val_copy=${glib_cv_va_val_copy=no} lftp_cv_va_copy=${lftp_cv_va_copy=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes} screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} diff --git a/site/x86_64-linux-uclibc b/site/x86_64-linux-uclibc index e88ed24ffb..fe235d05e2 100644 --- a/site/x86_64-linux-uclibc +++ b/site/x86_64-linux-uclibc @@ -61,7 +61,6 @@ glib_cv___va_copy=${glib_cv___va_copy=yes} glib_cv_va_copy=${glib_cv_va_copy=yes} glib_cv_va_val_copy=${glib_cv_va_val_copy=no} lftp_cv_va_copy=${lftp_cv_va_copy=yes} -mr_cv_target_elf=${mr_cv_target_elf=yes} nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes} screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} -- cgit v1.2.3 From 4d8969947f20857631fb65fd8d739d2d92efac75 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 23 Mar 2007 18:23:55 +0000 Subject: altboot: - CVS -> SVN - Fix do_install() and do_configure to use instead of fixed path --- packages/altboot/altboot_1.0.5.bb | 32 +++++++-------- packages/altboot/altboot_1.0.8.bb | 28 ++++++------- packages/altboot/altboot_wip.bb | 32 +++++++-------- .../altboot-menu/Advanced/30-bootUSB-Stick | 47 ---------------------- 4 files changed, 46 insertions(+), 93 deletions(-) delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index 2762001dbd..f70edc19b6 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -20,9 +20,9 @@ PACKAGE_ARCH = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=4" -S = "${WORKDIR}/altboot/" +S = "${WORKDIR}/${TAG}/" ###################################################################################### @@ -35,37 +35,37 @@ do_install() { if test -d ${WORKDIR}/altboot/${MACHINE} then - install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc else - install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc + install -m 0644 ${S}/altboot*.cfg ${D}/etc fi - install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin - if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ + if test -d ${S}/${MACHINE}/altboot-menu/ then - install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu else - install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu fi - if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/ + if test -d ${S}/${MACHINE}/altboot-menu/Advanced/ then - install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced else - install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced fi - install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc } ###################################################################################### do_configure() { - cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_ - mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot } ###################################################################################### diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index c52c0972a3..a83d2b5d16 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -34,9 +34,9 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" -S = "${WORKDIR}/altboot/" +S = "${WORKDIR}/${TAG}/" ###################################################################################### @@ -52,30 +52,30 @@ do_install() { install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - if test -d ${WORKDIR}/altboot/${MACHINE} + if test -d ${S}/${MACHINE} then - install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc else - install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc + install -m 0644 ${S}/altboot*.cfg ${D}/etc fi - install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds - install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc } ###################################################################################### do_configure() { - cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_ - mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot } ###################################################################################### diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb index 2de4c812b9..d857e5b454 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_wip.bb @@ -38,9 +38,9 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" -SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" -S = "${WORKDIR}/altboot/" +S = "${WORKDIR}/${TAG}/" ###################################################################################### @@ -57,32 +57,32 @@ do_install() { install -d ${D}/usr/share/sounds install -d ${D}/etc/skel/altboot - if test -d ${WORKDIR}/altboot/${MACHINE} + if test -d ${S}/${MACHINE} then - install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ else - install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi - install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds - install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc - install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altboot/altbootctl ${D}/sbin + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin - install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc } ###################################################################################### do_configure() { - cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${WORKDIR}/altboot/init.altboot_ - mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot } ###################################################################################### diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick deleted file mode 100644 index b573e7a10c..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick +++ /dev/null @@ -1,47 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot USB Storage" - -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - echo "Starting USB..." - - for module in $USB_STORAGE_MODULES - do - echo -en "\t - $module: " - modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]" - done - - echo -n "Mounting $USB_STORAGE_PARTITION..." >/dev/tty0 - - mkdir -p /media/usb-storage >/dev/null 2>&1 - - sleep "$USB_STORAGE_WAIT" - - /bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Check for a real fs and loop-images. - check_target "/media/usb-storage" >/dev/tty0 -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - -- cgit v1.2.3 From def0e1d60fa293b5d9fffd605e37df08e0dea397 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 23 Mar 2007 18:47:49 +0000 Subject: altboot_1.1.1+wip-20061123.bb: Add fixed snapshot for Zaurus models --- packages/altboot/altboot_1.1.1+wip-20061123.bb | 99 ++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 packages/altboot/altboot_1.1.1+wip-20061123.bb diff --git a/packages/altboot/altboot_1.1.1+wip-20061123.bb b/packages/altboot/altboot_1.1.1+wip-20061123.bb new file mode 100644 index 0000000000..d857e5b454 --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-20061123.bb @@ -0,0 +1,99 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +WIP_DATE = "20061123" + +PV = "1.1.1+wip-${WIP_DATE}" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" + +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" + +S = "${WORKDIR}/${TAG}/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + install -d ${D}/etc/skel/altboot + + if test -d ${S}/${MACHINE} + then + install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + update-alternatives --remove init /sbin/init.altboot +} + -- cgit v1.2.3 From da428e8a3b734914adc34ab20d30199a1d7e49e5 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 23 Mar 2007 19:27:47 +0000 Subject: altboot: Update _wip.bb to 20070323, enabling first Neo1973 aka fic-gta01 support. --- packages/altboot/altboot_wip.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb index d857e5b454..9b4f5092cd 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_wip.bb @@ -23,7 +23,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### -WIP_DATE = "20061123" +WIP_DATE = "20070323" PV = "1.1.1+wip-${WIP_DATE}" PR = "r0" @@ -38,7 +38,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=6" S = "${WORKDIR}/${TAG}/" -- cgit v1.2.3 From 8cceec03812e487d023a132f0e6f4ba7dbdbdce0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 23 Mar 2007 23:02:19 +0000 Subject: openmoko-apps: fix description in openmoko-messages --- packages/openmoko-apps/openmoko-messages_svn.bb | 5 +++-- packages/openmoko-apps/openmoko-rssreader_svn.bb | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index d7a708b85c..4411b860a1 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -1,7 +1,8 @@ -DESCRIPTION = "The OpenMoko Application Manager" +DESCRIPTION = "The OpenMoko Messaging Application" SECTION = "openmoko/applications" -DEPENDS += "ipkg" + PV = "0.0.1+svn${SRCDATE}" +PR = "r1" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-rssreader_svn.bb b/packages/openmoko-apps/openmoko-rssreader_svn.bb index ea3f6ca50d..aed1ff08d8 100644 --- a/packages/openmoko-apps/openmoko-rssreader_svn.bb +++ b/packages/openmoko-apps/openmoko-rssreader_svn.bb @@ -1,10 +1,9 @@ DESCRIPTION = "The OpenMoko RSS Reader" SECTION = "openmoko/applications" +DEPENDS += "libmrss" PV = "0.0.1+svn${SRCDATE}" PR = "r1" inherit openmoko -DEPENDS += "libmrss" - -- cgit v1.2.3 From 8ecde9c8ec093f6e33a8bf63ed031cc8a390fb79 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 09:33:41 +0000 Subject: mplayer: add optimizations for a780 and hx4700 --- packages/mplayer/mplayer_svn.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index a9d8d0f1ff..886dbb072f 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -167,13 +167,24 @@ EXTRA_OECONF = " \ --disable-runtime-cpudetection \ " +EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2" + +#enable support for the ati imageon series (w100 and w3220) EXTRA_OECONF_append_c7x0 = " --enable-w100 " EXTRA_OECONF_append_hx4700 = " --enable-imageon " -EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2" + +#enable pxa270 overlay support EXTRA_OECONF_append_spitz = " --enable-pxa " +EXTRA_OECONF_append_a780 = " --enable-pxa " +#build with support for the iwmmxt instruction support (pxa270 and up) TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH_spitz = "iwmmxt" +TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_a780 = "iwmmxt" +TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_hx4700= "iwmmxt" + do_configure() { cp ${WORKDIR}/vo_w100.c ${S}/libvo -- cgit v1.2.3 From 8d3e0e6921054399f6e263b8dd81e6d047d6057c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 09:35:55 +0000 Subject: gsm: add default 'default' file --- packages/gsm/files/default | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/gsm/files/default diff --git a/packages/gsm/files/default b/packages/gsm/files/default new file mode 100644 index 0000000000..161c97f5fb --- /dev/null +++ b/packages/gsm/files/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +#GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +#GSM_DEV="/dev/ttyS1" -- cgit v1.2.3 From eda1cd8de4efb77de391963e3238c534bd5724af Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 09:39:44 +0000 Subject: task-openmoko: remove some duplication with task-base and add sms and rss app --- packages/tasks/task-openmoko.bb | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index cad921020e..dc4c7dcb0f 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r30" +PR = "r31" PACKAGES = "\ task-openmoko-linux \ @@ -29,21 +29,9 @@ RDEPENDS_task-openmoko-everything := "${PACKAGES}" DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services" RDEPENDS_task-openmoko-linux = "\ task-base \ - base-files \ - base-passwd \ - busybox \ - dropbear \ - fuser \ - initscripts \ - netbase \ sysfsutils \ - setserial \ - sysvinit \ - sysvinit-pidof \ - tinylogin \ modutils-initscripts \ module-init-tools-depmod \ - udev \ rsync \ # update-alternatives \ " @@ -167,6 +155,9 @@ RDEPENDS_task-openmoko-demo = "\ openmoko-panel-demo-simple \ openmoko-panel-gsm \ openmoko-panel-mainmenu \ + openmoko-rssreader \ + openmoko-messages \ + openmoko-today \ xcursor-transparent-theme \ web \ rxvt-unicode \ -- cgit v1.2.3 From a11b05312d81a8ccabd4c8c93de0741d03df8190 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 24 Mar 2007 10:54:11 +0000 Subject: image.bbclass: Removed wildcard rm as it broke building multiple rootfs image types. --- classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/image.bbclass b/classes/image.bbclass index 5055b5b987..4f870915d0 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -93,7 +93,7 @@ fakeroot do_rootfs () { fi cd ${DEPLOY_DIR_IMAGE}/ - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.* + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type done -- cgit v1.2.3 From 91af788b8040fa8aae027ad7da2790d19db3fda3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 14:47:16 +0000 Subject: bluez-utils: enable cups backend and package it seperately so only bluez-cups-backend depends on cups at runtime --- packages/bluez/bluez-utils.inc | 9 ++++--- packages/bluez/bluez-utils_3.7.bb | 56 +++++++++++++++++++++++++++++++++++++++ packages/bluez/bluez-utils_3.9.bb | 2 +- 3 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 packages/bluez/bluez-utils_3.7.bb diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index a22431eaf9..eb4425d650 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." SECTION = "console" PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" +DEPENDS = "bluez-libs-${PV} dbus cups" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" RREPLACES = "bluez-utils-dbus" @@ -20,7 +20,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" S = "${WORKDIR}/bluez-utils-${PV}" -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-cups" # --enable-obex enable OBEX support # --enable-alsa enable ALSA support # --enable-cups install CUPS backend support @@ -48,7 +48,10 @@ do_install_append() { CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ ${sysconfdir}/default/bluetooth" -PACKAGES =+ "${PN}-ciptool" +PACKAGES =+ "${PN}-ciptool bluez-cups-backend" FILES_${PN}-ciptool = "/bin/ciptool" RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb new file mode 100644 index 0000000000..3dbaa030c1 --- /dev/null +++ b/packages/bluez/bluez-utils_3.7.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} dbus cups alsa-lib openobex" +PROVIDES = "bluez-utils-dbus" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" +RREPLACES = "bluez-utils-dbus" +RCONFLICTS_${PN} = "bluez-utils-nodbus" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + file://hciattach-ti-bts.patch;patch=1" + +# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol +# Let's default to that instead of 'any' until further notice... +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-obex --enable-alsa --enable-cups" +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + mv ${D}${bindir}/* ${D}${base_bindir}/ + rmdir ${D}${bindir} ${D}${sbindir} + chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig + install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool bluez-cups-backend" +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index 36410ee2ec..dce6648afe 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -1,3 +1,3 @@ require bluez-utils.inc -PR = "r2" +PR = "r3" -- cgit v1.2.3 From 4c83c9f064e16f78e6ab01e874a0dcea541856a1 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 24 Mar 2007 17:34:42 +0000 Subject: altboot: Replace rev= with proto=svn.... and update altboot_0.0.0.bb to latest svn --- packages/altboot/altboot_0.0.0.bb | 8 ++- packages/altboot/altboot_1.0.5.bb | 2 +- packages/altboot/altboot_1.0.8.bb | 2 +- packages/altboot/altboot_wip.bb | 2 +- packages/altboot/files/altboot-menu/10-noGui | 2 + .../files/altboot-menu/Advanced/70-install-tgz | 2 + packages/altboot/files/init.altboot | 73 +++++++++++++--------- 7 files changed, 56 insertions(+), 35 deletions(-) diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 31aaeb3e7a..930a30c1ac 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -8,6 +8,7 @@ DESCRIPTION = "The altboot bootmanager" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" LICENSE = "GPL" +INHIBIT_PACKAGE_STRIP = "1" ###################################################################################### @@ -24,7 +25,7 @@ RDEPENDS_${PN}_fic-gta01 = "${PN}-conf kernel-module-ext2 kernel-module-loop ker ###################################################################################### -PR = "r51" +PR = "r52" ###################################################################################### @@ -68,7 +69,10 @@ do_install() { install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + if test -d ${WORKDIR}/altboot-menu/Advanced + then + install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index f70edc19b6..3a8a0a74b7 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -20,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=4" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index a83d2b5d16..aed66b47a8 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -34,7 +34,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb index 9b4f5092cd..37a8b5f9dd 100644 --- a/packages/altboot/altboot_wip.bb +++ b/packages/altboot/altboot_wip.bb @@ -38,7 +38,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=6" +SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/files/altboot-menu/10-noGui b/packages/altboot/files/altboot-menu/10-noGui index 57141d498d..cf3c10c381 100644 --- a/packages/altboot/files/altboot-menu/10-noGui +++ b/packages/altboot/files/altboot-menu/10-noGui @@ -1,6 +1,8 @@ # !/bin/sh M_TITLE="Don't launch GUI" +test "$DISABLE_NOGUI_BOOT" = yes && exit 0 + run_module() { clear ; exec $REAL_INIT "$NO_GUI_RL" diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz index aca0d047c6..b6e5d94d5d 100644 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz @@ -2,6 +2,8 @@ M_TITLE="Install RootFS from tar.gz" M_FLAGS="noRemember" +test "$DISABLE_INSTTGZ_BOOT" = yes && exit 0 + run_module(){ test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 5eb6122a2a..30868024b8 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -20,12 +20,6 @@ test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5 # If this step fails the results are fatal. Seen on Collie / kernel 2.4 (where else...) OUT_TTY="`tty`" ; test -z "$OUT_TTY" && OUT_TTY="/dev/tty1" -if test -z "$OUT_TTY" -then - OUT_TTY="/dev/tty1" - echo "WARNING: Assgnment of OUT_TTY failed!" > "$OUT_TTY" -fi - if ( echo "$OUT_TTY" | grep -q "not" ) then OUT_TTY="/dev/tty1" @@ -47,7 +41,7 @@ then rm "${ALTBOOT_CFG_FILE}.next-reboot" fi -test "$ENABLE_DEBUGGING" = "yes" && ENABLE_DEBUG="yes" +ENABLE_DEBUG="$ENABLE_DEBUGGING" C_RED="\033[31m" C_YELLOW="\033[33m" @@ -81,10 +75,9 @@ debug_shell() { show_menu() { test -z "$1" && die "DEBUG: Parameter 1 is empty in show_menu" ! test -d "$1" && die "show_menu: [$1] not found or no directory." - + echo "" - echo -e "altboot v$VERSION\n" - + echo -e "altboot v$VERSION\n" m_entry="" @@ -93,6 +86,7 @@ show_menu() { cnt=0 ; reset_pref "menu_filelist" for file in `ls -1` do +# debug_echo "show_menu(): file = [$file]" if ! test -d "$1/$file" then # NOTE: It is important to use "." here so that the script inherits @@ -165,11 +159,7 @@ show_menu() { fi done - echo "" - -# export_pref "$menu_filelist" /tmp/menu_filelist.cache -# export_pref "$menu_fileflags" /tmp/menu_fileflags.cache - + echo "" } # This function is used to display the content of directories below @@ -178,11 +168,7 @@ show_sub_menu() { dirname="`basename "$1"`" d_entries="`dump_pref "menu_filelist" | grep "$dirname/"`" - - #dump_pref "menu_filelist" - #dump_pref "menu_fileflags" - #echo "[$d_entries]" - + echo -e "\naltboot v$VERSION: $dirname menu\n" for d_entry in $d_entries @@ -190,11 +176,7 @@ show_sub_menu() { d_entry_number="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\1/p"`" d_entry_file="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\2/p"`" d_entry_title="`$d_entry_file title`" - -# echo "number: [$d_entry_number]" -# echo "file: [$d_entry_file]" -# echo "title: [$d_entry_title]" - + echo -e "\t\t[$d_entry_number] $d_entry_title" done @@ -231,7 +213,7 @@ get_kbd_ints(){ # Shows the timer and sets $launch_altboot to yes if a keypress was detected run_timer() { - if test "$TIMEOUT" != 0 + if test "$TIMEOUT" != 0 -a "$TIMEOUT" != "[none]" then mount -t proc proc /proc >/dev/null 2>&1 @@ -278,6 +260,17 @@ run_timer() { else launch_altboot=yes fi + + if test "$TIMEOUT" = "[none]" + then + echo "" + echo -e "altboot v$VERSION ($MACHINE)\n" + + echo "NOTE: The menu is not available on this device" + echo "Use \"set-bootdev\" to change the boot device" + + launch_altboot=no + fi } # $1 = ID @@ -313,7 +306,7 @@ launch_selection() { file="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\1/p"`" test -z "$file" && file="$file_" - #echo "[$file_]: [$type] : [$flags] / [$file] ($junk)" +# debug_echo "[$file_]: [$type] : [$flags] / [$file] ($junk)" # The selected menu-item points to a directory if test "$type" = DIR @@ -494,10 +487,29 @@ fi # Note: this is positively ugly. If someone knows a better way to detect whether # we are already booted into a runlevel _without_ reading /var and / or using `runlevel` # PLEASE let me know. +# +# The NSLU2 is an exception as it uses the way-ugly busybox "ps" +# + +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" -if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1" != "+force" +case "$MACHINE" in + *NSLU2) if test -f /proc/cmdline -a "`ps |wc -l|tr -d " "`" -gt 25 -a "$1" != "-force" -a "$1" != "+force" + then + user_called=1 + fi + ;; + + *) if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1"!= "+force" >/dev/null 2>&1 + then + user_called=1 + fi + ;; +esac + +if test "$user_called" = "1" then - echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >"$OUT_TTY" + echo "altboot: Using real init [$REAL_INIT] [$*] [`ps |wc -l|tr -d " "`] *" >"$OUT_TTY" exec $REAL_INIT $* # exec $SH_SHELL /dev/tty0 2>&1 exit 0 @@ -543,7 +555,8 @@ else echo "Booting last selection: [$last_selection]" >"$OUT_TTY" # Set up the wanna-be array of available menu entries and their numbers - show_menu /etc/altboot-menu >/dev/null + show_menu /etc/altboot-menu >/dev/null 2>&1 + junk="$last_selection" launch_selection /etc/altboot-menu >"$OUT_TTY" fi -- cgit v1.2.3 From b7b2f07b086e749e7cd6aae62f862d5a0f7452a4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 17:36:42 +0000 Subject: angstrom: add a provider for gtk+ on Holgers advice --- conf/distro/angstrom-2007.1.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 503a07aaea..8d74633821 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -110,6 +110,7 @@ PREFERRED_PROVIDER_esound ?= "pulseaudio" # we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -- cgit v1.2.3 From e06636078b375d497bba32b0a8b29394f8b21aaa Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 24 Mar 2007 04:47:35 +0000 Subject: gpstk: Open source libraries and applications to facilitate working with GPS data for research and high accuracy uses. --- packages/gpstk/.mtn2git_empty | 0 packages/gpstk/files/.mtn2git_empty | 0 packages/gpstk/files/configure.patch | 10 ++++++++++ packages/gpstk/gpstk_1.2.bb | 13 +++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 packages/gpstk/.mtn2git_empty create mode 100644 packages/gpstk/files/.mtn2git_empty create mode 100644 packages/gpstk/files/configure.patch create mode 100644 packages/gpstk/gpstk_1.2.bb diff --git a/packages/gpstk/.mtn2git_empty b/packages/gpstk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpstk/files/.mtn2git_empty b/packages/gpstk/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpstk/files/configure.patch b/packages/gpstk/files/configure.patch new file mode 100644 index 0000000000..b975512131 --- /dev/null +++ b/packages/gpstk/files/configure.patch @@ -0,0 +1,10 @@ +--- gpstk-1.2/configure.ac~ 2006-12-21 06:59:41.000000000 +1030 ++++ gpstk-1.2/configure.ac 2007-03-24 14:59:42.000000000 +1030 +@@ -53,6 +53,7 @@ + apps/ionosphere/Makefile + apps/MDPtools/Makefile + apps/mergetools/Makefile ++ apps/multipath/Makefile + apps/reszilla/Makefile + apps/time/Makefile + apps/positioning/Makefile diff --git a/packages/gpstk/gpstk_1.2.bb b/packages/gpstk/gpstk_1.2.bb new file mode 100644 index 0000000000..8d13b5f225 --- /dev/null +++ b/packages/gpstk/gpstk_1.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Libraries and applications to facilitate working with GPS data for research and high accuracy uses." +HOMEPAGE = "http://www.gpstk.org/" +LICENSE = "LGPL" +SECTION = "libs" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gpstk/gpstk-${PV}-src.tar.gz \ + file://configure.patch;patch=1" + +inherit autotools lib_package + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 8ece62c5b6636aff97af5933fd5b16494d4dad25 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 24 Mar 2007 09:51:08 +0000 Subject: openmoko-today: Added missing eds-dbus build time dependency. --- packages/openmoko-pim/openmoko-today_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb index 8eb098bebb..74e79b85f1 100644 --- a/packages/openmoko-pim/openmoko-today_svn.bb +++ b/packages/openmoko-pim/openmoko-today_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko Today application." SECTION = "openmoko/pim" LICENSE = "GPL" -DEPENDS = "openmoko-libs" +DEPENDS = "openmoko-libs eds-dbus" PV = "0.1+svn${SRCDATE}" inherit autotools pkgconfig gtk-icon-cache openmoko -- cgit v1.2.3 From 95e68956c2863f790de0bdef7c6373403912b9b5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 24 Mar 2007 09:52:11 +0000 Subject: openmoko.inc: Added PREFERRED_PROVIDER_gtk+ like in angstrom. --- conf/distro/include/openmoko.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 4c728e1922..c41f993884 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -90,6 +90,7 @@ PREFERRED_VERSION_gtk-engines = "2.6.5" PREFERRED_VERSION_fontconfig = "2.4.1" # we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -- cgit v1.2.3 From 683486ef28c1a8413b027c36daaff85005653d9f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Mar 2007 09:26:46 +0000 Subject: gpstk: add a custom do_install * the autotools based system doesn't build everything * only a static libgpstk is created * somehow strip fails, leaving us with a 9.5MB big gpstk-bin package --- packages/gpstk/gpstk_1.2.bb | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/packages/gpstk/gpstk_1.2.bb b/packages/gpstk/gpstk_1.2.bb index 8d13b5f225..64ed3e025f 100644 --- a/packages/gpstk/gpstk_1.2.bb +++ b/packages/gpstk/gpstk_1.2.bb @@ -3,11 +3,70 @@ HOMEPAGE = "http://www.gpstk.org/" LICENSE = "LGPL" SECTION = "libs" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/gpstk/gpstk-${PV}-src.tar.gz \ file://configure.patch;patch=1" inherit autotools lib_package +EXTRA_OECONF = "--enable-shared" + do_stage() { autotools_stage_all } + + +# This is a handcrafted do_install because 'make install' isn't working. +# This should install the same files as my native (x86) jam based build, but doesn't since the Makefiles +# aren't up to date (e.g. bc2sp3 is missing). +# Koen - 20070325 +do_install() { + +install -d ${D}${bindir} +install -d ${D}${libdir} +install -d ${D}${includedir}/ + +for i in bc2sp3 calgps DDBase ddmerge DiscFix EditRinex ephdiff example1 example2 example3 example4 example5 \ + fic2rin ficacheck ficafic ficcheck ficdiff ficfica findMoreThan12 IonoBias mergeFIC mergeRinMet \ + mergeRinNav mergeRinObs mergeSRI mkord mpsolve navdmp NavMerge novaRinex ordClock ordEdit ordGen \ + ordLinEs ordPlot ordStats poscvt posInterp PRSolve ResCor resplot reszilla RinexDump rinexpvt \ + rinexthin RinSum rmwcheck rmwdiff rnwcheck rnwdiff rowcheck rowdiff rstats rtAshtech sp3version \ + TECMaps timeconvert tnl tsrif tsrifsu tsriftu vecsol wheresat + do install -m 755 `find . -name $i` ${D}${bindir}/ || true +done + cp -pPr src/.libs/libgps* ${D}${libdir}/ + +for i in AlmanacStore.hpp AlmOrbit.hpp ANSITime.hpp Bancroft.hpp BasicFramework.hpp BCEphemerisStore.hpp \ + BinexData.hpp BinexFilterOperators.hpp BinexStream.hpp BinUtils.hpp BivarStats.hpp CheckPRData.hpp \ + CivilTime.hpp ClockModel.hpp CodeBuffer.hpp CommandOption.hpp CommandOptionParser.hpp \ + CommandOptionWithCommonTimeArg.hpp CommandOptionWithPositionArg.hpp CommandOptionWithTimeArg.hpp \ + CommonTime.hpp convhelp.hpp DayTime.hpp DOP.hpp ECEF.hpp EngAlmanac.hpp EngEphemeris.hpp EngNav.hpp \ + EphemerisRange.hpp EphemerisStore.hpp EpochClockModel.hpp Exception.hpp Expression.hpp ExtractC1.hpp \ + ExtractCombinationData.hpp ExtractD1.hpp ExtractD2.hpp ExtractData.hpp ExtractL1.hpp ExtractL2.hpp \ + ExtractLC.hpp ExtractP1.hpp ExtractP2.hpp ExtractPC.hpp FFBinaryStream.hpp FFData.hpp FFStreamError.hpp \ + FFStream.hpp FFTextStream.hpp FICAStream.hpp FICBase.hpp FICData109.hpp FICData162.hpp FICData62.hpp \ + FICData9.hpp FICData.hpp FICFilterOperators.hpp FICHeader.hpp FICStreamBase.hpp FICStream.hpp \ + FileFilterFrame.hpp FileFilterFrameWithHeader.hpp FileFilter.hpp FileHunter.hpp FileSpec.hpp \ + FileStore.hpp FileUtils.hpp GenXSequence.hpp Geodetic.hpp GeoidModel.hpp geometry.hpp getopt.h \ + gps_constants.hpp GPSEpochWeekSecond.hpp GPSGeoid.hpp gpstkplatform.h GPSWeekSecond.hpp GPSWeekZcount.hpp \ + GPSZcount29.hpp GPSZcount32.hpp GPSZcount.hpp icd_200_constants.hpp IonoModel.hpp IonoModelStore.hpp \ + JulianDate.hpp LinearClockModel.hpp LoopedFramework.hpp MathBase.hpp MatrixBase.hpp \ + MatrixBaseOperators.hpp MatrixFunctors.hpp Matrix.hpp MatrixImplementation.hpp MatrixOperators.hpp \ + mergePCodeWords.h MiscMath.hpp MJD.hpp ModeledPR.hpp ModeledPseudorangeBase.hpp ModeledReferencePR.hpp \ + MOPSWeight.hpp MSCData.hpp MSCStream.hpp ObsClockModel.hpp ObsEpochMap.hpp ObsID.hpp ObsRngDev.hpp \ + ORDEpoch.hpp PCodeConst.hpp PolyFit.hpp Position.hpp PRSolution.hpp RACRotation.hpp \ + RinexEphemerisStore.hpp RinexMetBase.hpp RinexMetData.hpp RinexMetFilterOperators.hpp \ + RinexMetHeader.hpp RinexMetStream.hpp RinexNavBase.hpp RinexNavData.hpp RinexNavFilterOperators.hpp \ + RinexNavHeader.hpp RinexNavStream.hpp RinexObsBase.hpp RinexObsData.hpp RinexObsFilterOperators.hpp \ + RinexObsHeader.hpp RinexObsID.hpp RinexObsStream.hpp RinexSatID.hpp RinexUtilities.hpp RTFileFrame.hpp \ + RungeKutta4.hpp SatID.hpp SimpleIURAWeight.hpp SMODFData.hpp SMODFStream.hpp SolverBase.hpp SolverLMS.hpp \ + SolverWMS.hpp SP3Base.hpp SP3Data.hpp SP3EphemerisStore.hpp SP3Header.hpp SP3SatID.hpp SP3Stream.hpp \ + Stats.hpp stl_helpers.hpp StringUtils.hpp SVExclusionList.hpp SVPCodeGen.hpp SystemTime.hpp \ + TabularEphemerisStore.hpp TimeConstants.hpp TimeConverters.hpp TimeString.hpp TimeTag.hpp Triple.hpp \ + TropModel.hpp UnixTime.hpp ValidType.hpp VectorBase.hpp VectorBaseOperators.hpp \ + Vector.hpp VectorOperators.hpp WeightBase.hpp WGS84Geoid.hpp WxObsMap.hpp X1Sequence.hpp \ + X2Sequence.hpp Xvt.hpp YDSTime.hpp + do install -m 644 `find . -name $i` ${D}${includedir}/ || true +done +} -- cgit v1.2.3 From 36085720c44a9ecdc149d3dcb214a08992d8b7c5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 00:34:32 +0000 Subject: slugos-packages: Added upslug2, devio and slugimage --- packages/meta/slugos-packages.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index a69db4f173..41ddc79e8d 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r28" +PR = "r29" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -47,6 +47,7 @@ SLUGOS_PACKAGES = "\ cyrus-imapd \ cyrus-sasl \ db \ + devio \ devlabel \ diffstat \ diffutils \ @@ -154,6 +155,7 @@ SLUGOS_PACKAGES = "\ setpwc \ setserial \ sipsak \ + slugimage \ smartmontools \ ssmtp \ strace \ @@ -165,6 +167,7 @@ SLUGOS_PACKAGES = "\ tiff \ tzdata \ unzip \ + upslug2 \ usbutils \ util-linux \ vim \ -- cgit v1.2.3 From 65adc5f0c8da5f9fee2e226926ef82bbb4befe70 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 10:58:58 +0000 Subject: haserl: Add package haserl --- packages/haserl/.mtn2git_empty | 0 packages/haserl/haserl_0.8.0.bb | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 packages/haserl/.mtn2git_empty create mode 100644 packages/haserl/haserl_0.8.0.bb diff --git a/packages/haserl/.mtn2git_empty b/packages/haserl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/haserl/haserl_0.8.0.bb b/packages/haserl/haserl_0.8.0.bb new file mode 100644 index 0000000000..4df013a5ef --- /dev/null +++ b/packages/haserl/haserl_0.8.0.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "A cgi wrapper for embedding shell scripts into html documents" +SECTION = "console/network" +DEPENDS = "" +PR = "r0" +LICENSE = "GPL" + +SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/haserl/haserl-0.8.0.tar.gz" + +inherit autotools gettext -- cgit v1.2.3 From 60b031c351624fae9d511eb50b8cd7c5aac860b9 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 11:43:24 +0000 Subject: haserl: Fix SRC_URI --- packages/haserl/haserl_0.8.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/haserl/haserl_0.8.0.bb b/packages/haserl/haserl_0.8.0.bb index 4df013a5ef..3011e6329a 100644 --- a/packages/haserl/haserl_0.8.0.bb +++ b/packages/haserl/haserl_0.8.0.bb @@ -4,6 +4,6 @@ DEPENDS = "" PR = "r0" LICENSE = "GPL" -SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/haserl/haserl-0.8.0.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/haserl/haserl-${PV}.tar.gz" inherit autotools gettext -- cgit v1.2.3 From fe305985f767faee287b00e7f818b338c7889dcf Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 11:58:52 +0000 Subject: haserl: Correct my SRC_URI-commit --- packages/haserl/haserl_0.8.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/haserl/haserl_0.8.0.bb b/packages/haserl/haserl_0.8.0.bb index 3011e6329a..ba10060c9c 100644 --- a/packages/haserl/haserl_0.8.0.bb +++ b/packages/haserl/haserl_0.8.0.bb @@ -4,6 +4,6 @@ DEPENDS = "" PR = "r0" LICENSE = "GPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/haserl/haserl-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" inherit autotools gettext -- cgit v1.2.3 From 905e42a65b6b3a4545da57885a436c58d15d5939 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 25 Mar 2007 15:02:49 +0000 Subject: uboot: Update linkstation uboot --- .../defconfig_linkstationppchd | 500 --------------------- .../defconfig_linkstationppchg | 500 --------------------- .../uboot/u-boot-linkstationppc/defconfig_lsppchd | 500 +++++++++++++++++++++ .../uboot/u-boot-linkstationppc/defconfig_lsppchg | 500 +++++++++++++++++++++ packages/uboot/u-boot-linkstationppc_git.bb | 7 +- 5 files changed, 1004 insertions(+), 1003 deletions(-) delete mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd delete mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg create mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_lsppchd create mode 100644 packages/uboot/u-boot-linkstationppc/defconfig_lsppchg diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd b/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd deleted file mode 100644 index 5919f5eb2c..0000000000 --- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd +++ /dev/null @@ -1,500 +0,0 @@ -/* - * Copyright (C) 2006 Mihai Georgian - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#if 0 -#define DEBUG -#endif - -/*----------------------------------------------------------------------- - * User configurable settings: - * Mandatory settings: - * CONFIG_IPADDR_LS - the IP address of the LinkStation - * CONFIG_SERVERIP_LS - the address of the server for NFS/TFTP/DHCP/BOOTP - * Optional settins: - * CONFIG_NCIP_LS - the adress of the computer running net console - * if not configured, it will be set to - * CONFIG_SERVERIP_LS - */ - -#define CONFIG_IPADDR_LS 192.168.11.150 -#define CONFIG_SERVERIP_LS 192.168.11.149 - -#if !defined(CONFIG_IPADDR_LS) || !defined(CONFIG_SERVERIP_LS) -#error Both CONFIG_IPADDR_LS and CONFIG_SERVERIP_LS must be defined -#endif - -#if !defined(CONFIG_NCIP_LS) -#define CONFIG_NCIP_LS CONFIG_SERVERIP_LS -#endif - -/*---------------------------------------------------------------------- - * DO NOT CHANGE ANYTHING BELOW, UNLESS YOU KNOW WHAT YOU ARE DOING - *---------------------------------------------------------------------*/ - -#define CONFIG_MPC8245 1 -#define CONFIG_LINKSTATION 1 - -/*--------------------------------------- - * Supported models - * - * LinkStation HDLAN /KuroBox Standard (CONFIG_HLAN) - * LinkStation old model (CONFIG_LAN) - totally untested - * LinkStation HGLAN / KuroBox HG (CONFIG_HGLAN) - * - * Models not supported yet - * TeraStatin (CONFIG_HTGL) - */ - -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define CONFIG_IDENT_STRING " LinkStation / KuroBox" -#elif defined(CONFIG_HGLAN) -#define CONFIG_IDENT_STRING " LinkStation HG / KuroBox HG" -#elif defined(CONFIG_HTGL) -#define CONFIG_IDENT_STRING " TeraStation" -#else -#error No LinkStation model defined -#endif - -#define CONFIG_BOOTDELAY 10 -#define CONFIG_ZERO_BOOTDELAY_CHECK -#undef CONFIG_BOOT_RETRY_TIME - -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Boot in %02d seconds ('s' to stop)..." -#define CONFIG_AUTOBOOT_STOP_STR "s" - -#define CONFIG_COMMANDS (CFG_CMD_BDI | \ - CFG_CMD_LOADS | \ - CFG_CMD_LOADB | \ - CFG_CMD_FLASH | \ - CFG_CMD_MEMORY | \ - CFG_CMD_NET | \ - CFG_CMD_ENV | \ - CFG_CMD_IDE | \ - CFG_CMD_PCI | \ - CFG_CMD_BOOTD | \ - CFG_CMD_CONSOLE | \ - CFG_CMD_RUN | \ - CFG_CMD_ECHO | \ - CFG_CMD_DHCP | \ - CFG_CMD_PING | \ - CFG_CMD_NFS | \ - CFG_CMD_EXT2 ) -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL - -#define CONFIG_OF_FLAT_TREE 1 - -#ifdef CONFIG_OF_FLAT_TREE -#define OF_CPU "PowerPC,603e" -#define OF_SOC "soc10x@80000000" -#define OF_STDOUT_PATH "/soc10x/serial@80004600" -#endif - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include - -/* - * Miscellaneous configurable options - */ -#define CFG_LONGHELP /* undef to save memory */ -#define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ - -#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) -#define CFG_MAXARGS 16 /* Max number of command args */ -#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -#define CFG_LOAD_ADDR 0x00800000 /* Default load address: 8 MB */ - -//#define CONFIG_BOOTCOMMAND "run nfsboot" -#define CONFIG_BOOTCOMMAND "run bootcmd1" -#define CONFIG_BOOTARGS "root=/dev/sda1 netconsole=6666@192.168.11.150/,@192.168.11.149/ rtc-rs5c372.probe=0,0x32" -#define CONFIG_NFSBOOTCOMMAND "bootp;run nfsargs;bootm" - -#define CFG_CONSOLE_IS_IN_ENV - -#define XMK_STR(x) #x -#define MK_STR(x) XMK_STR(x) - -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define UBFILE "share/u-boot/u-boot-hd.flash.bin" -#elif defined(CONFIG_HGLAN) -#define UBFILE "share/u-boot/u-boot-hg.flash.bin" -#elif defined(CONFIG_HTGL) -#define UBFILE "share/u-boot/u-boot-ht.flash.bin" -#else -#error No LinkStation model defined -#endif - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "autoload=no\0" \ - "stdin=nc\0" \ - "stdout=nc\0" \ - "stderr=nc\0" \ - "ipaddr="MK_STR(CONFIG_IPADDR_LS)"\0" \ - "netmask=255.255.255.0\0" \ - "serverip="MK_STR(CONFIG_SERVERIP_LS)"\0" \ - "ncip="MK_STR(CONFIG_NCIP_LS)"\0" \ - "netretry=no\0" \ - "nc=setenv stdin nc;setenv stdout nc;setenv stderr nc\0" \ - "ser=setenv stdin serial;setenv stdout serial;setenv stderr serial\0" \ - "ldaddr=800000\0" \ - "hdpart=0:1\0" \ - "hdfile=boot/uImage\0" \ - "hdload=echo Loading ${hdpart}:${hdfile};ext2load ide ${hdpart} ${ldaddr} ${hdfile};ext2load ide ${hdpart} 7f0000 boot/kuroboxHD.dtb\0" \ - "boothd=setenv bootargs " CONFIG_BOOTARGS ";bootm ${ldaddr} - 7f0000\0" \ - "hdboot=run hdload boothd\0" \ - "flboot=setenv bootargs root=/dev/hda1;bootm ffc00000\0" \ - "emboot=setenv bootargs root=/dev/ram0;bootm ffc00000\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \ - "bootretry=30\0" \ - "bootcmd1=run hdboot;run flboot\0" \ - "bootcmd2=run flboot\0" \ - "bootcmd3=run emboot\0" \ - "writeng=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4e474e47 1;cp.b 800000 fff70000 4\0" \ - "writeok=protect off fff70000 fff7ffff;era fff70000 fff7ffff;mw.l 800000 4f4b4f4b 1;cp.b 800000 fff70000 4\0" \ - "ubpart=0:1\0" \ - "ubfile="UBFILE"\0" \ - "ubload=echo Loading ${ubpart}:${ubfile};ext2load ide ${ubpart} ${ldaddr} ${ubfile}\0" \ - "ubsaddr=fff00000\0" \ - "ubeaddr=fff2ffff\0" \ - "ubflash=protect off ${ubsaddr} ${ubeaddr};era ${ubsaddr} ${ubeaddr};cp.b ${ldaddr} ${ubsaddr} ${filesize};cmp.b ${ldaddr} ${ubsaddr} ${filesize}\0" \ - "upgrade=run ubload ubflash\0" - -/*----------------------------------------------------------------------- - * PCI stuff - */ -#define CONFIG_PCI -#undef CONFIG_PCI_PNP -#define CONFIG_PCI_SCAN_SHOW - -#ifndef CONFIG_PCI_PNP -/* Keep the following defines in sync with the BAT mappings */ - -#define PCI_ETH_IOADDR 0xbfff00 -#define PCI_ETH_MEMADDR 0xbffffc00 -#define PCI_IDE_IOADDR 0xbffed0 -#define PCI_IDE_MEMADDR 0xbffffb00 -#define PCI_USB0_IOADDR 0 -#define PCI_USB0_MEMADDR 0xbfffe000 -#define PCI_USB1_IOADDR 0 -#define PCI_USB1_MEMADDR 0xbfffd000 -#define PCI_USB2_IOADDR 0 -#define PCI_USB2_MEMADDR 0xbfffcf00 - -#endif - -/*----------------------------------------------------------------------- - * Ethernet stuff - */ -#define CONFIG_NET_MULTI - -#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) -#define CONFIG_TULIP -#define CONFIG_TULIP_USE_IO -#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) -#define CONFIG_RTL8169 -#endif - -#define CONFIG_NET_RETRY_COUNT 5 - -#define CONFIG_NETCONSOLE - -/*----------------------------------------------------------------------- - * Start addresses for the final memory configuration - * (Set up by the startup code) - * Please note that CFG_SDRAM_BASE _must_ start at 0 - */ -#define CFG_SDRAM_BASE 0x00000000 - -#define CFG_FLASH_BASE 0xFFC00000 -#define CFG_MONITOR_BASE TEXT_BASE - -#define CFG_RESET_ADDRESS 0xFFF00100 -#define CFG_EUMB_ADDR 0x80000000 -#define CFG_PCI_MEM_ADDR 0xB0000000 -#define CFG_MISC_REGION_ADDR 0xFE000000 - -#define CFG_MONITOR_LEN 0x00040000 /* 256 kB */ -#define CFG_MALLOC_LEN (512 << 10) /* Reserve some kB for malloc() */ - -#define CFG_MEMTEST_START 0x00100000 /* memtest works on */ -#define CFG_MEMTEST_END 0x00800000 /* 1M ... 8M in DRAM */ - -/* Maximum amount of RAM */ -#if defined(CONFIG_HLAN) || defined(CONFIG_LAN) -#define CFG_MAX_RAM_SIZE 0x04000000 /* 64MB of SDRAM */ -#elif defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) -#define CFG_MAX_RAM_SIZE 0x08000000 /* 128MB of SDRAM */ -#else -#error Unknown LinkStation type -#endif - -/*----------------------------------------------------------------------- - * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build - * - * RAM based builds a