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 are for testing purposes. A Linux module, uloader.o, - * exists to load U-Boot and pass control to it - * - * Always do "make clean" after changing the build type - */ -#if CFG_MONITOR_BASE < CFG_FLASH_BASE -#define CFG_RAMBOOT -#endif - -/*----------------------------------------------------------------------- - * Definitions for initial stack pointer and data area - */ -#if 1 /* RAM is available when the first C function is called */ -#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) -#else -#define CFG_INIT_RAM_ADDR 0x40000000 -#endif -#define CFG_INIT_RAM_END 0x1000 -#define CFG_GBL_DATA_SIZE 128 -#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) - -/*---------------------------------------------------------------------- - * Serial configuration - */ -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 57600 -#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } - -#define CFG_NS16550 -#define CFG_NS16550_SERIAL - -#define CFG_NS16550_REG_SIZE 1 - -#define CFG_NS16550_CLK get_bus_freq(0) - -#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ -#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ - -/* - * Low Level Configuration Settings - * (address mappings, register initial values, etc.) - * You should know what you are doing if you make changes here. - * For the detail description refer to the MPC8245 user's manual. - * - * Unless indicated otherwise, the values are - * taken from the orignal Linkstation boot code - * - * Most of the low level configuration setttings are normally used - * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. - * Low level initialisation is done in board/linkstation/early_init.S - * The values below are included for reference purpose only - */ - -/* FIXME: 32.768 MHz is the crystal frequency but */ -/* the real frequency is lower by about 0.75% */ -#define CONFIG_SYS_CLK_FREQ 32768000 -#define CFG_HZ 1000 - -/* Bit-field values for MCCR1. */ -#define CFG_ROMNAL 0 -#define CFG_ROMFAL 11 - -#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ -#define CFG_BANK1_ROW 0 -#define CFG_BANK2_ROW 0 -#define CFG_BANK3_ROW 0 -#define CFG_BANK4_ROW 0 -#define CFG_BANK5_ROW 0 -#define CFG_BANK6_ROW 0 -#define CFG_BANK7_ROW 0 - -/* Bit-field values for MCCR2. */ -#define CFG_TSWAIT 0 -#define CFG_REFINT 1400 - -/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ -#define CFG_BSTOPRE 121 - -/* Bit-field values for MCCR3. */ -#define CFG_REFREC 7 - -/* Bit-field values for MCCR4. */ -#define CFG_PRETOACT 2 -#define CFG_ACTTOPRE 5 /* Original value was 2 */ -#define CFG_ACTORW 2 -#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ -#define CFG_REGISTERD_TYPE_BUFFER 1 -#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ -#define CFG_REGDIMM 0 -#define CFG_DBUS_SIZE2 1 -#define CFG_SDMODE_WRAP 0 - -#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ -#define CFG_SDRAM_DSCD 0x30 - -/* Memory bank settings. - * Only bits 20-29 are actually used from these vales to set the - * start/end addresses. The upper two bits will always be 0, and the lower - * 20 bits will be 0x00000 for a start address, or 0xfffff for an end - * address. Refer to the MPC8240 book. - */ - -#define CFG_BANK0_START 0x00000000 -#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) -#define CFG_BANK0_ENABLE 1 -#define CFG_BANK1_START 0x3ff00000 -#define CFG_BANK1_END 0x3fffffff -#define CFG_BANK1_ENABLE 0 -#define CFG_BANK2_START 0x3ff00000 -#define CFG_BANK2_END 0x3fffffff -#define CFG_BANK2_ENABLE 0 -#define CFG_BANK3_START 0x3ff00000 -#define CFG_BANK3_END 0x3fffffff -#define CFG_BANK3_ENABLE 0 -#define CFG_BANK4_START 0x3ff00000 -#define CFG_BANK4_END 0x3fffffff -#define CFG_BANK4_ENABLE 0 -#define CFG_BANK5_START 0x3ff00000 -#define CFG_BANK5_END 0x3fffffff -#define CFG_BANK5_ENABLE 0 -#define CFG_BANK6_START 0x3ff00000 -#define CFG_BANK6_END 0x3fffffff -#define CFG_BANK6_ENABLE 0 -#define CFG_BANK7_START 0x3ff00000 -#define CFG_BANK7_END 0x3fffffff -#define CFG_BANK7_ENABLE 0 - -#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ - -/*---------------------------------------------------------------------- - * Initial BAT mappings - */ - -/* NOTES: - * 1) GUARDED and WRITETHROUGH not allowed in IBATS - * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT - */ - -/* SDRAM */ -#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) -#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) - -#define CFG_DBAT0L CFG_IBAT0L -#define CFG_DBAT0U CFG_IBAT0U - -/* EUMB: 1MB of address space */ -#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) - -#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT1U CFG_IBAT1U - -/* PCI Mem: 256MB of address space */ -#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) - -#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT2U CFG_IBAT2U - -/* PCI and local ROM/Flash: last 32MB of address space */ -#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) - -#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT3U CFG_IBAT3U - -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - * - * FIXME: This doesn't appear to be true for the newer kernels - * which map more that 8 MB - */ -#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ - -/*----------------------------------------------------------------------- - * FLASH organization - */ -#undef CFG_FLASH_PROTECTION -#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ -#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ - -#define CFG_FLASH_ERASE_TOUT 12000 -#define CFG_FLASH_WRITE_TOUT 1000 - - -#define CFG_ENV_IS_IN_FLASH -/* - * The original LinkStation flash organisation uses - * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader - * We use the last sector of this area to store the environment - * which leaves max. 384 kB for the U-Boot itself - */ -#define CFG_ENV_ADDR 0xFFF60000 -#define CFG_ENV_SIZE 0x00010000 -#define CFG_ENV_SECT_SIZE 0x00010000 - -/*----------------------------------------------------------------------- - * Cache Configuration - */ -#define CFG_CACHELINE_SIZE 32 -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ -#endif - -/*----------------------------------------------------------------------- - * IDE/ATA definitions - */ -#undef CONFIG_IDE_LED /* No IDE LED */ -#define CONFIG_IDE_RESET /* no reset for ide supported */ -#define CONFIG_IDE_PREINIT /* check for units */ -#define CONFIG_LBA48 /* 48 bit LBA supported */ - -#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) -#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ -#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ -#elif defined(CONFIG_HGTL) -#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ -#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ -#else -#error Config IDE: Unknown LinkStation type -#endif - -#define CFG_ATA_BASE_ADDR 0 - -#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ -#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ -#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ - -/*----------------------------------------------------------------------- - * Partitions and file system - */ -#define CONFIG_DOS_PARTITION - -/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -#endif /* __CONFIG_H */ - -/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg b/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg deleted file mode 100644 index b9943b4c76..0000000000 --- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg +++ /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/kuroboxHG.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 are for testing purposes. A Linux module, uloader.o, - * exists to load U-Boot and pass control to it - * - * Always do "make clean" after changing the build type - */ -#if CFG_MONITOR_BASE < CFG_FLASH_BASE -#define CFG_RAMBOOT -#endif - -/*----------------------------------------------------------------------- - * Definitions for initial stack pointer and data area - */ -#if 1 /* RAM is available when the first C function is called */ -#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) -#else -#define CFG_INIT_RAM_ADDR 0x40000000 -#endif -#define CFG_INIT_RAM_END 0x1000 -#define CFG_GBL_DATA_SIZE 128 -#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) - -/*---------------------------------------------------------------------- - * Serial configuration - */ -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 57600 -#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } - -#define CFG_NS16550 -#define CFG_NS16550_SERIAL - -#define CFG_NS16550_REG_SIZE 1 - -#define CFG_NS16550_CLK get_bus_freq(0) - -#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ -#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ - -/* - * Low Level Configuration Settings - * (address mappings, register initial values, etc.) - * You should know what you are doing if you make changes here. - * For the detail description refer to the MPC8245 user's manual. - * - * Unless indicated otherwise, the values are - * taken from the orignal Linkstation boot code - * - * Most of the low level configuration setttings are normally used - * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. - * Low level initialisation is done in board/linkstation/early_init.S - * The values below are included for reference purpose only - */ - -/* FIXME: 32.768 MHz is the crystal frequency but */ -/* the real frequency is lower by about 0.75% */ -#define CONFIG_SYS_CLK_FREQ 32768000 -#define CFG_HZ 1000 - -/* Bit-field values for MCCR1. */ -#define CFG_ROMNAL 0 -#define CFG_ROMFAL 11 - -#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ -#define CFG_BANK1_ROW 0 -#define CFG_BANK2_ROW 0 -#define CFG_BANK3_ROW 0 -#define CFG_BANK4_ROW 0 -#define CFG_BANK5_ROW 0 -#define CFG_BANK6_ROW 0 -#define CFG_BANK7_ROW 0 - -/* Bit-field values for MCCR2. */ -#define CFG_TSWAIT 0 -#define CFG_REFINT 1400 - -/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ -#define CFG_BSTOPRE 121 - -/* Bit-field values for MCCR3. */ -#define CFG_REFREC 7 - -/* Bit-field values for MCCR4. */ -#define CFG_PRETOACT 2 -#define CFG_ACTTOPRE 5 /* Original value was 2 */ -#define CFG_ACTORW 2 -#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ -#define CFG_REGISTERD_TYPE_BUFFER 1 -#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ -#define CFG_REGDIMM 0 -#define CFG_DBUS_SIZE2 1 -#define CFG_SDMODE_WRAP 0 - -#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ -#define CFG_SDRAM_DSCD 0x30 - -/* Memory bank settings. - * Only bits 20-29 are actually used from these vales to set the - * start/end addresses. The upper two bits will always be 0, and the lower - * 20 bits will be 0x00000 for a start address, or 0xfffff for an end - * address. Refer to the MPC8240 book. - */ - -#define CFG_BANK0_START 0x00000000 -#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) -#define CFG_BANK0_ENABLE 1 -#define CFG_BANK1_START 0x3ff00000 -#define CFG_BANK1_END 0x3fffffff -#define CFG_BANK1_ENABLE 0 -#define CFG_BANK2_START 0x3ff00000 -#define CFG_BANK2_END 0x3fffffff -#define CFG_BANK2_ENABLE 0 -#define CFG_BANK3_START 0x3ff00000 -#define CFG_BANK3_END 0x3fffffff -#define CFG_BANK3_ENABLE 0 -#define CFG_BANK4_START 0x3ff00000 -#define CFG_BANK4_END 0x3fffffff -#define CFG_BANK4_ENABLE 0 -#define CFG_BANK5_START 0x3ff00000 -#define CFG_BANK5_END 0x3fffffff -#define CFG_BANK5_ENABLE 0 -#define CFG_BANK6_START 0x3ff00000 -#define CFG_BANK6_END 0x3fffffff -#define CFG_BANK6_ENABLE 0 -#define CFG_BANK7_START 0x3ff00000 -#define CFG_BANK7_END 0x3fffffff -#define CFG_BANK7_ENABLE 0 - -#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ - -/*---------------------------------------------------------------------- - * Initial BAT mappings - */ - -/* NOTES: - * 1) GUARDED and WRITETHROUGH not allowed in IBATS - * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT - */ - -/* SDRAM */ -#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) -#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) - -#define CFG_DBAT0L CFG_IBAT0L -#define CFG_DBAT0U CFG_IBAT0U - -/* EUMB: 1MB of address space */ -#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) - -#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT1U CFG_IBAT1U - -/* PCI Mem: 256MB of address space */ -#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) - -#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT2U CFG_IBAT2U - -/* PCI and local ROM/Flash: last 32MB of address space */ -#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) - -#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) -#define CFG_DBAT3U CFG_IBAT3U - -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - * - * FIXME: This doesn't appear to be true for the newer kernels - * which map more that 8 MB - */ -#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ - -/*----------------------------------------------------------------------- - * FLASH organization - */ -#undef CFG_FLASH_PROTECTION -#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ -#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ - -#define CFG_FLASH_ERASE_TOUT 12000 -#define CFG_FLASH_WRITE_TOUT 1000 - - -#define CFG_ENV_IS_IN_FLASH -/* - * The original LinkStation flash organisation uses - * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader - * We use the last sector of this area to store the environment - * which leaves max. 384 kB for the U-Boot itself - */ -#define CFG_ENV_ADDR 0xFFF60000 -#define CFG_ENV_SIZE 0x00010000 -#define CFG_ENV_SECT_SIZE 0x00010000 - -/*----------------------------------------------------------------------- - * Cache Configuration - */ -#define CFG_CACHELINE_SIZE 32 -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ -#endif - -/*----------------------------------------------------------------------- - * IDE/ATA definitions - */ -#undef CONFIG_IDE_LED /* No IDE LED */ -#define CONFIG_IDE_RESET /* no reset for ide supported */ -#define CONFIG_IDE_PREINIT /* check for units */ -#define CONFIG_LBA48 /* 48 bit LBA supported */ - -#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) -#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ -#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ -#elif defined(CONFIG_HGTL) -#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ -#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ -#else -#error Config IDE: Unknown LinkStation type -#endif - -#define CFG_ATA_BASE_ADDR 0 - -#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ -#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ -#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ - -/*----------------------------------------------------------------------- - * Partitions and file system - */ -#define CONFIG_DOS_PARTITION - -/*----------------------------------------------------------------------- - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -#endif /* __CONFIG_H */ - -/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd new file mode 100644 index 0000000000..5919f5eb2c --- /dev/null +++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd @@ -0,0 +1,500 @@ +/* + * 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 are for testing purposes. A Linux module, uloader.o, + * exists to load U-Boot and pass control to it + * + * Always do "make clean" after changing the build type + */ +#if CFG_MONITOR_BASE < CFG_FLASH_BASE +#define CFG_RAMBOOT +#endif + +/*----------------------------------------------------------------------- + * Definitions for initial stack pointer and data area + */ +#if 1 /* RAM is available when the first C function is called */ +#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) +#else +#define CFG_INIT_RAM_ADDR 0x40000000 +#endif +#define CFG_INIT_RAM_END 0x1000 +#define CFG_GBL_DATA_SIZE 128 +#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) + +/*---------------------------------------------------------------------- + * Serial configuration + */ +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 57600 +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +#define CFG_NS16550 +#define CFG_NS16550_SERIAL + +#define CFG_NS16550_REG_SIZE 1 + +#define CFG_NS16550_CLK get_bus_freq(0) + +#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ +#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ + +/* + * Low Level Configuration Settings + * (address mappings, register initial values, etc.) + * You should know what you are doing if you make changes here. + * For the detail description refer to the MPC8245 user's manual. + * + * Unless indicated otherwise, the values are + * taken from the orignal Linkstation boot code + * + * Most of the low level configuration setttings are normally used + * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. + * Low level initialisation is done in board/linkstation/early_init.S + * The values below are included for reference purpose only + */ + +/* FIXME: 32.768 MHz is the crystal frequency but */ +/* the real frequency is lower by about 0.75% */ +#define CONFIG_SYS_CLK_FREQ 32768000 +#define CFG_HZ 1000 + +/* Bit-field values for MCCR1. */ +#define CFG_ROMNAL 0 +#define CFG_ROMFAL 11 + +#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ +#define CFG_BANK1_ROW 0 +#define CFG_BANK2_ROW 0 +#define CFG_BANK3_ROW 0 +#define CFG_BANK4_ROW 0 +#define CFG_BANK5_ROW 0 +#define CFG_BANK6_ROW 0 +#define CFG_BANK7_ROW 0 + +/* Bit-field values for MCCR2. */ +#define CFG_TSWAIT 0 +#define CFG_REFINT 1400 + +/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ +#define CFG_BSTOPRE 121 + +/* Bit-field values for MCCR3. */ +#define CFG_REFREC 7 + +/* Bit-field values for MCCR4. */ +#define CFG_PRETOACT 2 +#define CFG_ACTTOPRE 5 /* Original value was 2 */ +#define CFG_ACTORW 2 +#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ +#define CFG_REGISTERD_TYPE_BUFFER 1 +#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ +#define CFG_REGDIMM 0 +#define CFG_DBUS_SIZE2 1 +#define CFG_SDMODE_WRAP 0 + +#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ +#define CFG_SDRAM_DSCD 0x30 + +/* Memory bank settings. + * Only bits 20-29 are actually used from these vales to set the + * start/end addresses. The upper two bits will always be 0, and the lower + * 20 bits will be 0x00000 for a start address, or 0xfffff for an end + * address. Refer to the MPC8240 book. + */ + +#define CFG_BANK0_START 0x00000000 +#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) +#define CFG_BANK0_ENABLE 1 +#define CFG_BANK1_START 0x3ff00000 +#define CFG_BANK1_END 0x3fffffff +#define CFG_BANK1_ENABLE 0 +#define CFG_BANK2_START 0x3ff00000 +#define CFG_BANK2_END 0x3fffffff +#define CFG_BANK2_ENABLE 0 +#define CFG_BANK3_START 0x3ff00000 +#define CFG_BANK3_END 0x3fffffff +#define CFG_BANK3_ENABLE 0 +#define CFG_BANK4_START 0x3ff00000 +#define CFG_BANK4_END 0x3fffffff +#define CFG_BANK4_ENABLE 0 +#define CFG_BANK5_START 0x3ff00000 +#define CFG_BANK5_END 0x3fffffff +#define CFG_BANK5_ENABLE 0 +#define CFG_BANK6_START 0x3ff00000 +#define CFG_BANK6_END 0x3fffffff +#define CFG_BANK6_ENABLE 0 +#define CFG_BANK7_START 0x3ff00000 +#define CFG_BANK7_END 0x3fffffff +#define CFG_BANK7_ENABLE 0 + +#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ + +/*---------------------------------------------------------------------- + * Initial BAT mappings + */ + +/* NOTES: + * 1) GUARDED and WRITETHROUGH not allowed in IBATS + * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT + */ + +/* SDRAM */ +#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) +#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) + +#define CFG_DBAT0L CFG_IBAT0L +#define CFG_DBAT0U CFG_IBAT0U + +/* EUMB: 1MB of address space */ +#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) + +#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT1U CFG_IBAT1U + +/* PCI Mem: 256MB of address space */ +#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) + +#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT2U CFG_IBAT2U + +/* PCI and local ROM/Flash: last 32MB of address space */ +#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) + +#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT3U CFG_IBAT3U + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + * + * FIXME: This doesn't appear to be true for the newer kernels + * which map more that 8 MB + */ +#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ + +/*----------------------------------------------------------------------- + * FLASH organization + */ +#undef CFG_FLASH_PROTECTION +#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ +#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ + +#define CFG_FLASH_ERASE_TOUT 12000 +#define CFG_FLASH_WRITE_TOUT 1000 + + +#define CFG_ENV_IS_IN_FLASH +/* + * The original LinkStation flash organisation uses + * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader + * We use the last sector of this area to store the environment + * which leaves max. 384 kB for the U-Boot itself + */ +#define CFG_ENV_ADDR 0xFFF60000 +#define CFG_ENV_SIZE 0x00010000 +#define CFG_ENV_SECT_SIZE 0x00010000 + +/*----------------------------------------------------------------------- + * Cache Configuration + */ +#define CFG_CACHELINE_SIZE 32 +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ +#endif + +/*----------------------------------------------------------------------- + * IDE/ATA definitions + */ +#undef CONFIG_IDE_LED /* No IDE LED */ +#define CONFIG_IDE_RESET /* no reset for ide supported */ +#define CONFIG_IDE_PREINIT /* check for units */ +#define CONFIG_LBA48 /* 48 bit LBA supported */ + +#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) +#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ +#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ +#elif defined(CONFIG_HGTL) +#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ +#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ +#else +#error Config IDE: Unknown LinkStation type +#endif + +#define CFG_ATA_BASE_ADDR 0 + +#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ +#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ +#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ + +/*----------------------------------------------------------------------- + * Partitions and file system + */ +#define CONFIG_DOS_PARTITION + +/*----------------------------------------------------------------------- + * Internal Definitions + * + * Boot Flags + */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ + +#endif /* __CONFIG_H */ + +/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg new file mode 100644 index 0000000000..b9943b4c76 --- /dev/null +++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg @@ -0,0 +1,500 @@ +/* + * 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/kuroboxHG.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 are for testing purposes. A Linux module, uloader.o, + * exists to load U-Boot and pass control to it + * + * Always do "make clean" after changing the build type + */ +#if CFG_MONITOR_BASE < CFG_FLASH_BASE +#define CFG_RAMBOOT +#endif + +/*----------------------------------------------------------------------- + * Definitions for initial stack pointer and data area + */ +#if 1 /* RAM is available when the first C function is called */ +#define CFG_INIT_RAM_ADDR (CFG_SDRAM_BASE + CFG_MAX_RAM_SIZE - 0x1000) +#else +#define CFG_INIT_RAM_ADDR 0x40000000 +#endif +#define CFG_INIT_RAM_END 0x1000 +#define CFG_GBL_DATA_SIZE 128 +#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) + +/*---------------------------------------------------------------------- + * Serial configuration + */ +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 57600 +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +#define CFG_NS16550 +#define CFG_NS16550_SERIAL + +#define CFG_NS16550_REG_SIZE 1 + +#define CFG_NS16550_CLK get_bus_freq(0) + +#define CFG_NS16550_COM1 (CFG_EUMB_ADDR + 0x4600) /* Console port */ +#define CFG_NS16550_COM2 (CFG_EUMB_ADDR + 0x4500) /* AVR port */ + +/* + * Low Level Configuration Settings + * (address mappings, register initial values, etc.) + * You should know what you are doing if you make changes here. + * For the detail description refer to the MPC8245 user's manual. + * + * Unless indicated otherwise, the values are + * taken from the orignal Linkstation boot code + * + * Most of the low level configuration setttings are normally used + * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation. + * Low level initialisation is done in board/linkstation/early_init.S + * The values below are included for reference purpose only + */ + +/* FIXME: 32.768 MHz is the crystal frequency but */ +/* the real frequency is lower by about 0.75% */ +#define CONFIG_SYS_CLK_FREQ 32768000 +#define CFG_HZ 1000 + +/* Bit-field values for MCCR1. */ +#define CFG_ROMNAL 0 +#define CFG_ROMFAL 11 + +#define CFG_BANK0_ROW 2 /* Only bank 0 used: 13 x n x 4 */ +#define CFG_BANK1_ROW 0 +#define CFG_BANK2_ROW 0 +#define CFG_BANK3_ROW 0 +#define CFG_BANK4_ROW 0 +#define CFG_BANK5_ROW 0 +#define CFG_BANK6_ROW 0 +#define CFG_BANK7_ROW 0 + +/* Bit-field values for MCCR2. */ +#define CFG_TSWAIT 0 +#define CFG_REFINT 1400 + +/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. */ +#define CFG_BSTOPRE 121 + +/* Bit-field values for MCCR3. */ +#define CFG_REFREC 7 + +/* Bit-field values for MCCR4. */ +#define CFG_PRETOACT 2 +#define CFG_ACTTOPRE 5 /* Original value was 2 */ +#define CFG_ACTORW 2 +#define CFG_SDMODE_CAS_LAT 2 /* For 100MHz bus. Use 3 for 133MHz */ +#define CFG_REGISTERD_TYPE_BUFFER 1 +#define CFG_EXTROM 1 /* Original setting but there is no EXTROM */ +#define CFG_REGDIMM 0 +#define CFG_DBUS_SIZE2 1 +#define CFG_SDMODE_WRAP 0 + +#define CFG_PGMAX 0x32 /* All boards use this setting. Original 0x92 */ +#define CFG_SDRAM_DSCD 0x30 + +/* Memory bank settings. + * Only bits 20-29 are actually used from these vales to set the + * start/end addresses. The upper two bits will always be 0, and the lower + * 20 bits will be 0x00000 for a start address, or 0xfffff for an end + * address. Refer to the MPC8240 book. + */ + +#define CFG_BANK0_START 0x00000000 +#define CFG_BANK0_END (CFG_MAX_RAM_SIZE - 1) +#define CFG_BANK0_ENABLE 1 +#define CFG_BANK1_START 0x3ff00000 +#define CFG_BANK1_END 0x3fffffff +#define CFG_BANK1_ENABLE 0 +#define CFG_BANK2_START 0x3ff00000 +#define CFG_BANK2_END 0x3fffffff +#define CFG_BANK2_ENABLE 0 +#define CFG_BANK3_START 0x3ff00000 +#define CFG_BANK3_END 0x3fffffff +#define CFG_BANK3_ENABLE 0 +#define CFG_BANK4_START 0x3ff00000 +#define CFG_BANK4_END 0x3fffffff +#define CFG_BANK4_ENABLE 0 +#define CFG_BANK5_START 0x3ff00000 +#define CFG_BANK5_END 0x3fffffff +#define CFG_BANK5_ENABLE 0 +#define CFG_BANK6_START 0x3ff00000 +#define CFG_BANK6_END 0x3fffffff +#define CFG_BANK6_ENABLE 0 +#define CFG_BANK7_START 0x3ff00000 +#define CFG_BANK7_END 0x3fffffff +#define CFG_BANK7_ENABLE 0 + +#define CFG_ODCR 0x95 /* 0x15 or 0x95 ? */ + +/*---------------------------------------------------------------------- + * Initial BAT mappings + */ + +/* NOTES: + * 1) GUARDED and WRITETHROUGH not allowed in IBATS + * 2) CACHEINHIBIT and WRITETHROUGH not allowed together in same BAT + */ + +/* SDRAM */ +#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) +#define CFG_IBAT0U (CFG_SDRAM_BASE | BATU_BL_128M | BATU_VS | BATU_VP) + +#define CFG_DBAT0L CFG_IBAT0L +#define CFG_DBAT0U CFG_IBAT0U + +/* EUMB: 1MB of address space */ +#define CFG_IBAT1L (CFG_EUMB_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT1U (CFG_EUMB_ADDR | BATU_BL_1M | BATU_VS | BATU_VP) + +#define CFG_DBAT1L (CFG_IBAT1L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT1U CFG_IBAT1U + +/* PCI Mem: 256MB of address space */ +#define CFG_IBAT2L (CFG_PCI_MEM_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT2U (CFG_PCI_MEM_ADDR | BATU_BL_256M | BATU_VS | BATU_VP) + +#define CFG_DBAT2L (CFG_IBAT2L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT2U CFG_IBAT2U + +/* PCI and local ROM/Flash: last 32MB of address space */ +#define CFG_IBAT3L (CFG_MISC_REGION_ADDR | BATL_PP_10 | BATL_CACHEINHIBIT) +#define CFG_IBAT3U (CFG_MISC_REGION_ADDR | BATU_BL_32M | BATU_VS | BATU_VP) + +#define CFG_DBAT3L (CFG_IBAT3L | BATL_GUARDEDSTORAGE) +#define CFG_DBAT3U CFG_IBAT3U + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + * + * FIXME: This doesn't appear to be true for the newer kernels + * which map more that 8 MB + */ +#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ + +/*----------------------------------------------------------------------- + * FLASH organization + */ +#undef CFG_FLASH_PROTECTION +#define CFG_MAX_FLASH_BANKS 1 /* Max number of flash banks */ +#define CFG_MAX_FLASH_SECT 72 /* Max number of sectors per flash */ + +#define CFG_FLASH_ERASE_TOUT 12000 +#define CFG_FLASH_WRITE_TOUT 1000 + + +#define CFG_ENV_IS_IN_FLASH +/* + * The original LinkStation flash organisation uses + * 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader + * We use the last sector of this area to store the environment + * which leaves max. 384 kB for the U-Boot itself + */ +#define CFG_ENV_ADDR 0xFFF60000 +#define CFG_ENV_SIZE 0x00010000 +#define CFG_ENV_SECT_SIZE 0x00010000 + +/*----------------------------------------------------------------------- + * Cache Configuration + */ +#define CFG_CACHELINE_SIZE 32 +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ +#endif + +/*----------------------------------------------------------------------- + * IDE/ATA definitions + */ +#undef CONFIG_IDE_LED /* No IDE LED */ +#define CONFIG_IDE_RESET /* no reset for ide supported */ +#define CONFIG_IDE_PREINIT /* check for units */ +#define CONFIG_LBA48 /* 48 bit LBA supported */ + +#if defined(CONFIG_LAN) || defined(CONFIG_HLAN) || defined(CONFIG_HGLAN) +#define CFG_IDE_MAXBUS 1 /* Scan only 1 IDE bus */ +#define CFG_IDE_MAXDEVICE 1 /* Only 1 drive per IDE bus */ +#elif defined(CONFIG_HGTL) +#define CFG_IDE_MAXBUS 2 /* Max. 2 IDE busses */ +#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */ +#else +#error Config IDE: Unknown LinkStation type +#endif + +#define CFG_ATA_BASE_ADDR 0 + +#define CFG_ATA_DATA_OFFSET 0 /* Offset for data I/O */ +#define CFG_ATA_REG_OFFSET 0 /* Offset for normal registers */ +#define CFG_ATA_ALT_OFFSET 0 /* Offset for alternate registers */ + +/*----------------------------------------------------------------------- + * Partitions and file system + */ +#define CONFIG_DOS_PARTITION + +/*----------------------------------------------------------------------- + * Internal Definitions + * + * Boot Flags + */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ + +#endif /* __CONFIG_H */ + +/* vim: set ts=4: */ diff --git a/packages/uboot/u-boot-linkstationppc_git.bb b/packages/uboot/u-boot-linkstationppc_git.bb index 2fe2f9e7ff..7baac2ba7c 100644 --- a/packages/uboot/u-boot-linkstationppc_git.bb +++ b/packages/uboot/u-boot-linkstationppc_git.bb @@ -3,15 +3,16 @@ PROVIDES = "virtual/bootloader" SECTION = "bootloader" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" DEFAULT_PREFERENCE = "-1" -COMPATIBLE_MACHINE = "linkstationppc" +COMPATIBLE_MACHINE = "(lsppchd|lsppchg)" SRC_URI = "git://www.jdl.com/software/u-boot-86xx.git;protocol=git \ file://u-boot-kurobox.patch;patch=1 \ file://u-boot-kurobox-fdt.patch;patch=1 \ - file://defconfig_linkstationppchg \ - file://defconfig_linkstationppchd \ + file://defconfig_lsppchg \ + file://defconfig_lsppchd \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From 1d0b59559c37157b629a886a6fce4ec0c4311899 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 25 Mar 2007 16:45:58 +0000 Subject: zaurus-clamshell: Fix jffs2 commandline, enable lzo compression --- conf/machine/include/zaurus-clamshell.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 93325d253b..f66502eff1 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,13 +1,13 @@ EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \ - sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ +IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ + --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ + && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ --eraseblock=${ERASEBLOCKSIZE} -l -p; \ - cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" -- cgit v1.2.3 From f9a697a2fd26e5ca7f0ea4eb153d4a3c2aafdbbe Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 25 Mar 2007 18:06:11 +0000 Subject: glibc, local.conf.sample: Introduce and handle new OE variable, GLIBC_GENERATE_LOCALES to limit set of generated binary locales. * If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge time-savior for developmental builds. Format: list of locale.encoding pairs with spaces as separators, e.g.: GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" * Check your distro for minimal set of locales required. Old-time default is "en_GB.UTF-8 de_DE.UTF-8 fr_FR.UTF-8". * Angstrom requires en_GB only. * This commit does not changes the default, which is still generation of all available locales. * Closes #1966. --- conf/local.conf.sample | 6 ++++++ packages/glibc/glibc-package.bbclass | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 02d54686f8..daffdda6de 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -90,6 +90,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" +# If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales +# generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge +# time-savior for developmental builds. Format: list of locale.encoding pairs +# with spaces as separators. +# GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" + # Uncomment this to select a particular major kernel version if the MACHINE setting # supports more than one major kernel version. Currently this is suported by the # following MACHINE types: poodle, tosa and simpad. diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 5783ab1fcf..4bd4223657 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -202,9 +202,14 @@ python package_do_split_gconvs () { do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) - f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") - supported = f.readlines() - f.close() + supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) + if not supported or supported == "all": + f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") + supported = f.readlines() + f.close() + else: + supported = supported.split() + supported = map(lambda s:s.replace(".", " ") + "\n", supported) dot_re = re.compile("(.*)\.(.*)") -- cgit v1.2.3 From 9c4d351f915c57dbe2452c19e7843a44ba601a02 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 25 Mar 2007 18:41:10 +0000 Subject: bitbake.conf: Make IMAGE_CMD_tar build uncompressed archives. Regression fix. --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9f6814e526..947afc3018 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -198,7 +198,7 @@ IMAGE_CMD_ext3 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_ IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" -IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." +IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)" -- cgit v1.2.3 From 5eaa8e1dd0f11b98dd38c50e3d7a9c20452db123 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Mar 2007 18:55:53 +0000 Subject: matchbox-panel2: don't make the applets replace mb-panel, that breaks image generation if you build both --- packages/matchbox2/matchbox-panel-2_svn.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index a0f4a7f484..5022afa41a 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -3,11 +3,11 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+" -RREPLACES = "matchbox-panel" -RCONFLICTS = "matchbox-panel" +RREPLACES_${PN} = "matchbox-panel" +RCONFLICTS_${PN} = "matchbox-panel" PV = "0.1+svn${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From c591e0475f84089bdae68d5cbdef2282cdc02bd2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 26 Mar 2007 08:47:38 +0000 Subject: ltrace: make it buildable on misc architectures (copied some stuff from linux-libc-headers recipe) - bug reported by Dodji Seketeli@OpenedHand --- packages/ltrace/ltrace_0.4.bb | 50 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb index 97b7d18d22..bae6d49b65 100644 --- a/packages/ltrace/ltrace_0.4.bb +++ b/packages/ltrace/ltrace_0.4.bb @@ -3,29 +3,61 @@ HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html" SECTION = "devel" DEPENDS = "libelf" LICENSE = "GPL" -PR = "r0" +PR = "r1" -SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz \ - ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ file://no-usr-include.patch;patch=1" inherit autotools PARALLEL_MAKE = "" -EXTRA_OEMAKE = "ARCH=${LTRACE_ARCH} \ - INSTALL_FILE='$(INSTALL) -p -m 0644' \ +EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \ INSTALL_PROGRAM='$(INSTALL) -p -m 0755' \ INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \ INSTALL_DIR='$(INSTALL) -p -d -m 0755' " export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include" -LTRACE_ARCH = "${TARGET_ARCH}" -LTRACE_ARCH_x86 = "i386" - do_configure_prepend() { ln -sf ./linux-gnu sysdeps/linux-gnueabi } do_compile() { - oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} + case ${TARGET_ARCH} in + alpha*) LTRACE_ARCH=alpha ;; + arm*) LTRACE_ARCH=arm ;; + cris*) LTRACE_ARCH=cris ;; + hppa*) LTRACE_ARCH=parisc ;; + i*86*) LTRACE_ARCH=i386 ;; + ia64*) LTRACE_ARCH=ia64 ;; + mips*) LTRACE_ARCH=mips ;; + m68k*) LTRACE_ARCH=m68k ;; + powerpc*) LTRACE_ARCH=ppc ;; + s390*) LTRACE_ARCH=s390 ;; + sh*) LTRACE_ARCH=sh ;; + sparc64*) LTRACE_ARCH=sparc64 ;; + sparc*) LTRACE_ARCH=sparc ;; + x86_64*) LTRACE_ARCH=x86_64 ;; + esac + oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} +} + +do_install() { + case ${TARGET_ARCH} in + alpha*) LTRACE_ARCH=alpha ;; + arm*) LTRACE_ARCH=arm ;; + cris*) LTRACE_ARCH=cris ;; + hppa*) LTRACE_ARCH=parisc ;; + i*86*) LTRACE_ARCH=i386 ;; + ia64*) LTRACE_ARCH=ia64 ;; + mips*) LTRACE_ARCH=mips ;; + m68k*) LTRACE_ARCH=m68k ;; + powerpc*) LTRACE_ARCH=ppc ;; + s390*) LTRACE_ARCH=s390 ;; + sh*) LTRACE_ARCH=sh ;; + sparc64*) LTRACE_ARCH=sparc64 ;; + sparc*) LTRACE_ARCH=sparc ;; + x86_64*) LTRACE_ARCH=x86_64 ;; + esac + oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D} } -- cgit v1.2.3 From 4755608021d2eb9322c27e6d9f76182b16497467 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 26 Mar 2007 09:51:46 +0000 Subject: libxaw: split into libxaw6/7/8 as our apps depend on one of them only so why install all --- packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb index 3961042a2d..ff240607cb 100644 --- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb @@ -1,9 +1,9 @@ require xorg-lib-common.inc DESCRIPTION = "Xaw is the X Athena Widget Set." - DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" +PR = "r1" XORG_PN = "libXaw" @@ -13,3 +13,9 @@ do_stage () { ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so } + +PACKAGES =+ "libxaw6 libxaw7 libxaw8" + +FILES_libxaw6 = "${libdir}/libXaw6.so.6*" +FILES_libxaw7 = "${libdir}/libXaw7.so.7*" +FILES_libxaw8 = "${libdir}/libXaw8.so.8*" -- cgit v1.2.3 From 79bf00a684dc72aaaaa1a6e154b20615137f5606 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 26 Mar 2007 11:36:47 +0000 Subject: gpe-conf: depends on tzdata instead of timezones, makes the USians a bit happier --- packages/gpe-conf/gpe-conf_0.2.3.bb | 4 ++-- packages/gpe-conf/gpe-conf_0.2.4.bb | 4 ++-- packages/gpe-conf/gpe-conf_0.2.5.bb | 4 ++-- packages/gpe-conf/gpe-conf_svn.bb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/gpe-conf/gpe-conf_0.2.3.bb b/packages/gpe-conf/gpe-conf_0.2.3.bb index 3f8ae1e9d5..0cb645c5d4 100644 --- a/packages/gpe-conf/gpe-conf_0.2.3.bb +++ b/packages/gpe-conf/gpe-conf_0.2.3.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons tzdata" RDEPENDS_gpe-conf-panel = "gpe-conf" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-conf/gpe-conf_0.2.4.bb b/packages/gpe-conf/gpe-conf_0.2.4.bb index aa458d089e..15a5bce0f3 100644 --- a/packages/gpe-conf/gpe-conf_0.2.4.bb +++ b/packages/gpe-conf/gpe-conf_0.2.4.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr" -RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr" +RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr" RDEPENDS_gpe-conf-panel = "gpe-conf" -PR = "r1" +PR = "r2" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb index 39f7679cc0..eff9f55033 100644 --- a/packages/gpe-conf/gpe-conf_0.2.5.bb +++ b/packages/gpe-conf/gpe-conf_0.2.5.bb @@ -4,13 +4,13 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr" -RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr" +RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr" RDEPENDS_gpe-conf-panel = "gpe-conf" RPROVIDES_${PN} += " bl" RCONFLICTS_${PN} = "bl" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-conf/gpe-conf_svn.bb b/packages/gpe-conf/gpe-conf_svn.bb index f3782ef0ac..266053073a 100644 --- a/packages/gpe-conf/gpe-conf_svn.bb +++ b/packages/gpe-conf/gpe-conf_svn.bb @@ -6,13 +6,13 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons" +RDEPENDS_${PN} = "xst tzdata xset ntpdate gpe-login gpe-icons" RDEPENDS_gpe-conf-panel = "gpe-conf" inherit autotools gpe PV = "0.2.5+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 80e03c31786137c4d72eed1da9f7da7b70434929 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:15:37 +0000 Subject: nslu2-image.bbclass: Made operation conditional upon an nslu2 override. --- classes/nslu2-image.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass index e1af34fa57..14bf989055 100644 --- a/classes/nslu2-image.bbclass +++ b/classes/nslu2-image.bbclass @@ -16,5 +16,5 @@ nslu2_pack_image () { rm -rf ${DEPLOY_DIR_IMAGE}/slug } -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native' -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " +EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native' +IMAGE_POSTPROCESS_COMMAND_nslu2 += "nslu2_pack_image; " -- cgit v1.2.3 From 66b3afb24f9d07959106ad5883253cf95f580644 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:20:49 +0000 Subject: nslu2[bl]e.conf: Inherit NSLU2 image creation class --- conf/machine/nslu2be.conf | 1 + conf/machine/nslu2le.conf | 2 ++ 2 files changed, 3 insertions(+) diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 87fab62b65..104bbdb397 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -16,3 +16,4 @@ require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--big-endian" +INHERIT += "nslu2-image" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 16114a80fa..86c4ce7a31 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -15,3 +15,5 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--little-endian" + +INHERIT += "nslu2-image" -- cgit v1.2.3 From 273489f987423d573d486620efb723fd438001d7 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:30:51 +0000 Subject: unslung-kernel, unslung-image: Changed to use the generic nslu2_pack_image class. --- packages/images/unslung-image.bb | 48 ++----------------------- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 4 +-- 2 files changed, 4 insertions(+), 48 deletions(-) diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index 897fb131c1..d77d5c96dc 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -12,17 +12,11 @@ DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" RDEPENDS = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg \ - libipkg \ -# cpio \ -# findutils \ + libc6-unslung slingbox ipkg libipkg \ ${UNSLUNG_EXTRA_RDEPENDS}" PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg \ - libipkg \ -# cpio \ -# findutils \ + libc6-unslung slingbox ipkg libipkg \ kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" @@ -76,27 +70,6 @@ unslung_clean_image () { ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 -# MJW - experimental right now, but no longer need cpio and find - # We need cpio and find, but we don't need any of the other stuff in - # the packages (users can install the full package with ipkg after - # unsling). Remove the extra files and executables, and clean up - # the entries from the ipkg database manually. - - #-- these are for cpio: -# rm -f ${IMAGE_ROOTFS}/usr/bin/mt -# rm -rf ${IMAGE_ROOTFS}/usr/libexec -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.* -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt -# sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status - - #-- and these for find: -# rm -f ${IMAGE_ROOTFS}/usr/bin/locate -# rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb -# rm -f ${IMAGE_ROOTFS}/usr/bin/xargs -# rm -f ${IMAGE_ROOTFS}/usr/bin/xargs.findutils -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.* -# sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status - # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip" # behavior to create an extra file named .debug/ containing # the stripped symbols. These files are supposed to be packaged @@ -120,20 +93,3 @@ unslung_clean_image () { # #### End of Hack! } - -nslu2_pack_image () { - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img - rm -rf ${DEPLOY_DIR_IMAGE}/slug -} - -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware' -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 531f389898..df3141725c 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" -PR = "r17" +PR = "r18" COMPATIBLE_HOST = 'arm.*-linux' COMPATIBLE_MACHINE = "nslu2" @@ -39,7 +39,7 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" -KERNEL_SUFFIX = "unslung" +KERNEL_SUFFIX = "${MACHINE}" CMDLINE_CONSOLE ?= "ttyS0,115200" CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}" -- cgit v1.2.3 From c94d05d33f4d266cb9c3996ed4d14c04868d24a8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:34:06 +0000 Subject: unslung-image: Bump the PR --- packages/images/unslung-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index d77d5c96dc..a24271a9d6 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -PR = "r25" +PR = "r26" COMPATIBLE_MACHINE = "nslu2" IMAGE_BASENAME = "unslung" -- cgit v1.2.3 From 91a686ccf1d8c457b592f924d81e4ac502283199 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:34:56 +0000 Subject: unslung-rootfs: Removed cpio and findutils stuff from unsling --- packages/nslu2-binary-only/unslung-rootfs/unsling | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling index 6c4dc4ca52..539a1d2b58 100755 --- a/packages/nslu2-binary-only/unslung-rootfs/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs/unsling @@ -182,9 +182,7 @@ if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passw echo "the device, or the formatting of the device." exit 1 fi -# /usr/bin/find / -xdev -print | /usr/bin/cpio -p -d -m -u $targ -# rm -rf $targ/dev ; mv $targ/dev.state $targ/dev -# rm -rf $targ/var ; mv $targ/var.state $targ/var + echo "./var/tmp" > /tmp/xfile echo "./dev.state" >> /tmp/xfile echo "./var.state" >> /tmp/xfile -- cgit v1.2.3 From 1b38ddfb48196763677fa144cc26c5fa3651b9a8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 26 Mar 2007 17:08:59 +0000 Subject: librsvg: add 2.16.1 --- packages/librsvg/librsvg_2.16.1.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/librsvg/librsvg_2.16.1.bb diff --git a/packages/librsvg/librsvg_2.16.1.bb b/packages/librsvg/librsvg_2.16.1.bb new file mode 100644 index 0000000000..49513128d7 --- /dev/null +++ b/packages/librsvg/librsvg_2.16.1.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Library for rendering SVG files" +SECTION = "x11/utils" +DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt" +LICENSE = "LGPL" + +EXTRA_OECONF = "--disable-mozilla-plugin" + +inherit autotools pkgconfig gnome + +PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" +FILES_${PN} = "${libdir}/*.so.*" +FILES_rsvg = "${bindir}/rsvg \ + ${bindir}/rsvg-view \ + ${bindir}/rsvg-convert \ + ${datadir}/pixmaps/svg-viewer.svg" +FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so.*" +FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \ + ${libdir}/gtk-2.0/*/*.la" +FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug" + +EXTRA_OECONF = "--disable-mozilla-plugin" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From e0c83af72bea72797ebeba598318670f86d842cb Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 26 Mar 2007 23:05:23 +0000 Subject: foonas: Update foonas distro --- conf/distro/foonas.conf | 11 +++++++---- conf/distro/include/foonas-glibc.inc | 23 +++++++++++++++++++++++ conf/distro/include/foonas-uclibc.inc | 22 ++++++++++++++++++++++ conf/distro/include/foonas.inc | 32 ++++++++++++-------------------- 4 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 conf/distro/include/foonas-glibc.inc create mode 100644 conf/distro/include/foonas-uclibc.inc diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index d21e5cfe6f..7608e298ab 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -10,10 +10,9 @@ DISTRO_NAME = "foonas" 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/1.0-dev/packages" -FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel" +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" -TARGET_OS = "linux" HOTPLUG = "udev" # Various defines for Thecus N2100 @@ -24,8 +23,8 @@ BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" 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;" -FOONAS_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 \ @@ -43,6 +42,10 @@ 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;' # diff --git a/conf/distro/include/foonas-glibc.inc b/conf/distro/include/foonas-glibc.inc new file mode 100644 index 0000000000..7ad71bf503 --- /dev/null +++ b/conf/distro/include/foonas-glibc.inc @@ -0,0 +1,23 @@ +# 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 new file mode 100644 index 0000000000..8315341b7e --- /dev/null +++ b/conf/distro/include/foonas-uclibc.inc @@ -0,0 +1,22 @@ +# 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 index 189b932716..b904e15d5a 100644 --- a/conf/distro/include/foonas.inc +++ b/conf/distro/include/foonas.inc @@ -1,6 +1,17 @@ # # 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" @@ -12,20 +23,6 @@ PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermedia #PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" #PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" -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_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" @@ -36,8 +33,6 @@ 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" @@ -53,8 +48,5 @@ 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" -GLIBC_EXTRA_OECONF = "--with-tls" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -GLIBC_ADDONS ?= "ports,nptl,libidn" +PREFERRED_VERSION_openlink = "svn" -- cgit v1.2.3 From 20541a166c40e317a61c118d0a022c267fd0e257 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 26 Mar 2007 23:06:47 +0000 Subject: storcenter: Make storcenter work with foonas --- conf/machine/storcenter.conf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 7463bc77d0..bb7c8f1bef 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,18 +1,23 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" -# TARGET_VENDOR = "oe" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" +MACHINE_TASK_PROVIDER = "task-base" + # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_TASK_PROVIDER = "task-base" -MACHINE_FEATURES= "kernel26 usbhost" -# don't go udev until kernel >=2.6.13 -#BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -BOOTSTRAP_EXTRA_RDEPENDS = "mdadm" +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" +MACHINE_TASK_PROVIDER = "task-base" + +# We want udev support in the image +udevdir = "/dev" + +EXTRA_IMAGECMD = "--big-endian" +ERASEBLOCK_SIZE = "0x10000" +IMAGE_FSTYPES = "jffs2" require conf/machine/include/tune-ppc603e.conf -- cgit v1.2.3 From 48c9a98908284963902fc29b4c47aed668bd5432 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 26 Mar 2007 23:07:52 +0000 Subject: update n2100, lsppchg and lspphcd images --- classes/lsppchd-image.bbclass | 7 ++++++- classes/lsppchg-image.bbclass | 7 ++++++- classes/n2100-image.bbclass | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass index 6aab20127a..bb150c7e15 100644 --- a/classes/lsppchd-image.bbclass +++ b/classes/lsppchd-image.bbclass @@ -1,3 +1,8 @@ +IMAGE_PREPROCESS_COMMAND_lsppchd += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;" +IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" +IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" +IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" + lsppchd_pack_image() { : -} \ No newline at end of file +} diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass index 5d9da87c7d..9ad0801fe3 100644 --- a/classes/lsppchg-image.bbclass +++ b/classes/lsppchg-image.bbclass @@ -1,3 +1,8 @@ +IMAGE_PREPROCESS_COMMAND_lsppchg += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;" +IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" +IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" +IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" + lsppchg_pack_image() { : -} \ No newline at end of file +} diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass index 519be213d5..393efae7e1 100644 --- a/classes/n2100-image.bbclass +++ b/classes/n2100-image.bbclass @@ -26,5 +26,5 @@ n2100_pack_image() { dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null cat $KERNEL $PADFILE $ROOTFS > $OUTPUT rm -f $PADFILE - ls -l $OUTPUT + ls -l $OUTPUT } -- cgit v1.2.3 From fa2a25a2700d2211fa302a27cb180ce8475f9cd8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 11:38:45 +0000 Subject: sysconf: A general utility for storing network configuration and CONFFILES in a flash partition --- packages/sysconf/.mtn2git_empty | 0 packages/sysconf/files/.mtn2git_empty | 0 packages/sysconf/files/conffiles | 56 ++ packages/sysconf/files/sysconf | 1041 +++++++++++++++++++++++++++++++++ packages/sysconf/files/sysconfsetup | 59 ++ packages/sysconf/sysconf_0.1.bb | 52 ++ 6 files changed, 1208 insertions(+) create mode 100644 packages/sysconf/.mtn2git_empty create mode 100644 packages/sysconf/files/.mtn2git_empty create mode 100644 packages/sysconf/files/conffiles create mode 100644 packages/sysconf/files/sysconf create mode 100644 packages/sysconf/files/sysconfsetup create mode 100644 packages/sysconf/sysconf_0.1.bb diff --git a/packages/sysconf/.mtn2git_empty b/packages/sysconf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sysconf/files/.mtn2git_empty b/packages/sysconf/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sysconf/files/conffiles b/packages/sysconf/files/conffiles new file mode 100644 index 0000000000..d99047ce24 --- /dev/null +++ b/packages/sysconf/files/conffiles @@ -0,0 +1,56 @@ +# conffiles +# Known 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 +preserve home/root/.ssh/authorized_keys diff --git a/packages/sysconf/files/sysconf b/packages/sysconf/files/sysconf new file mode 100644 index 0000000000..9499b4daa9 --- /dev/null +++ b/packages/sysconf/files/sysconf @@ -0,0 +1,1041 @@ +#!/bin/sh +# sysconf +# +# Utility to manipulate system configuration information held +# in a System Configuration partition +# + +# hardware +# the 'Hardware' string from cpuinfo +hardware(){ + sed -n 's!^Hardware *: !!p' /proc/cpuinfo +} +# +# 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;; + *DSM?G600*) echo dsmg600;; + *NSLU2*) echo nslu2;; + *FSG?3*) echo fsg3;; + *) echo unknown;; + esac +} + +# NSLU2 flash layout is non-standard. +case "$(machine)" in +nslu2) + kpart="Kernel" + syspart="SysConf" + ffspart="Flashdisk";; +*) + kpart="kernel" + syspart="sysconfig" + ffspart="filesystem";; +esac + +# +# mtblockdev "name" +# return (output) the block 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. +mtblockdev(){ + sed -n 's!^mtd\([0-9][0-9]*\):[^"]*"'"$1"'"$!/dev/mtdblock\1!p' /proc/mtd +} + +# +# sysconf_valid +# return true if the SysConf partition exists and seems to be +# potentially valid (it starts with a reasonable length). +sysconf_valid(){ + local sysdev + sysdev="$(mtblockdev $syspart)" + test -n "$sysdev" -a -b "$sysdev" && + devio "<<$sysdev" '!! b.10>s32768<&!' +} + +# +# sysvalmatch "section" "name" 'pattern' "configuration file" +# sysvalof "section" "name" "configuration file" +# sysval "section" "name" +# outputs the value of the SysConf variable 'name' from section 'section', +# if there are multiple definitions only the last is output +# NOTE: these functions should only be used internally, add entries to 'config' +# below if necessary. This is because 'config' does the defaulting. +sysvalmatch(){ + sed -n '/^\['"$1"'\]$/,/^\[.*\]$/s/^'"$2"'=\('"$3"'\)$/\1/p' "$4" | sed -n '$p' +} +sysvalof(){ + sysvalmatch "$1" "$2" '.*' "$3" +} +sysval(){ + test -r "$config_root/etc/default/sysconf" && + sysvalof "$1" "$2" "$config_root/etc/default/sysconf" +} +# +# syssection "section" +# outputs all the values from the given section changed to the format "name value" +# (i.e. the '=' is dropped). +syssection(){ + test -r "$config_root/etc/default/sysconf" && + sed -n '/^\['"$1"'\]$/,/^\[.*\]$/s/^\([^=]*\)=\(.*\)$/\1 \2/p' "$config_root/etc/default/sysconf" +} +# +# config "value" +# convenience callers for specific values to avoid mis-typing in scripts +# NOTE: this function does the defaulting, 'sysval' does not! +# config_root: if set this will override the root where config/sysval +# looks for /etc/default/sysconf +config(){ + case "$1" in + host) if test -n "$(sysval network disk_server_name)" + then + sysval network disk_server_name + elif test -n "$(sysval network default_server_name)" + then + sysval network default_server_name + else + # because we want the name to remain constant: + echo "brokenslug" + fi;; + domain) sysval network w_d_name;; + iface) if test -n "$(sysval network lan_interface)" + then + sysval network lan_interface + else + echo eth0 + fi;; + ip) if test -n "$(sysval network ip_addr)" + then + sysval network ip_addr + else + echo 192.168.1.77 + fi;; + netmask)sysval network netmask;; + gateway)sysval network gateway;; + dns) sysval network dns_server1;; + dns2) sysval network dns_server2;; + dns3) sysval network dns_server3;; + boot) if test -n "$(sysval network bootproto)" + then + sysval network bootproto + else + echo dhcp + fi;; + valid) test -r "$config_root/etc/default/sysconf";; + *) return 1;; + esac +} + +# +# sysconf_read [prefix] +# read the $syspart partition (if present) writing the result into +# /etc/default/sysconf, if the result is empty it will be removed. +sysconf_read(){ + local sysdev sedcmd config_root + config_root="$1" + rm -f /tmp/sysconf.new + sysdev="$(mtblockdev $syspart)" + if sysconf_valid + then + # Read the defined part of $syspart into /etc/default/sysconf. + # $syspart has lines of two forms: + # + # [section] + # name=value + # + # In practice $syspart also contains other stuff, use the command: + # + # devio '</tmp/sysconf.new + fi + # + # test the result - sysconf must be non-empty + if test -s /tmp/sysconf.new + then + mv /tmp/sysconf.new "$config_root/etc/default/sysconf" + else + rm -f /tmp/sysconf.new + return 1 + fi +} + +# +# sysconf_default [prefix] +# Provde a default /etc/default/sysconf when there is no $syspart partition, +# or when it is invalid, this function will read from an existing sysconf, +# copying the values into the new one. +# sysconf_line tag config-tag +# write an appropriate line if the config value is non-empty +sysconf_line(){ + config "$2" | { + local value + read value + test -n "$value" && echo "$1"="$value" + } +} +# +sysconf_default(){ + local config_root + config_root="$1" + { echo '[network]' + sysconf_line disk_server_name host + sysconf_line w_d_name domain + sysconf_line lan_interface iface + sysconf_line ip_addr ip + sysconf_line netmask netmask + sysconf_line gateway gateway + sysconf_line dns_server1 dns + sysconf_line dns_server2 dns2 + sysconf_line dns_server3 dns3 + sysconf_line bootproto boot + } >/tmp/sysconf.new + mv /tmp/sysconf.new "$config_root/etc/default/sysconf" +} + +# +# sysconf_reload [prefix] +# read the values from /etc/default/sysconf and use these values to set +# up the following system files: +# +# /etc/hostname +# /etc/defaultdomain +# /etc/resolv.conf +# /etc/network/interfaces +# /etc/motd +# +sysconf_reload(){ + local config_root host domain iface boot ip netmask gateway ifname iftype + config_root="$1" + host="$(config host)" + test -n "$host" && echo "$host" >"$config_root/etc/hostname" + domain="$(config domain)" + test -n "$domain" && echo "$domain" >"$config_root/etc/defaultdomain" + # + # The DNS server information gives up to three nameservers, + # but this currently only binds in the first. + { + test -n "$domain" && echo "search $domain" + test -n "$(config dns)" && echo "nameserver $(config dns)" + test -n "$(config dns2)" && echo "nameserver $(config dns2)" + test -n "$(config dns3)" && echo "nameserver $(config dns3)" + } >"$config_root/etc/resolv.conf" + # + # Ethernet information. This goes into /etc/network/interfaces, + # however this is only used for static setup (and this is not + # the default). With dhcp the slugos udhcp script, + # /etc/udhcpc.d/50default, loads the values from sysconf. + iface="$(config iface)" + boot="$(config boot)" + # Only dhcp and static are supported at present - bootp + # support requires installation of appropriate packages + # dhcp is the fail-safe + case "$boot" in + dhcp|static) ;; + *) boot=dhcp;; + esac + # + ip="$(config ip)" + netmask="$(config netmask)" + gateway="$(config gateway)" + { + echo "# /etc/network/interfaces" + echo "# configuration file for ifup(8), ifdown(8)" + echo "#" + echo "# The loopback interface" + echo "auto lo" + echo "iface lo inet loopback" + echo "#" + echo "# The interface used by default during boot" + echo "auto $iface" + echo "# Automatically generated from /etc/default/sysconf" + echo "# address, netmask and gateway are ignored for 'dhcp'" + echo "# but required for 'static'" + echo "iface $iface inet $boot" + # The following are ignored for DHCP but are harmless + test -n "$ip" && echo " address $ip" + test -n "$netmask" && echo " netmask $netmask" + test -n "$gateway" && echo " gateway $gateway" + # + # Now read all the other ARPHRD_ETHER (type=1) interfaces + # and add an entry for each. + for ifname in $(test -d /sys/class/net && ls /sys/class/net) + do + if test -r "/sys/class/net/$ifname/type" -a "$ifname" != "$iface" + then + read iftype <"/sys/class/net/$ifname/type" + case "$iftype" in + 1) echo "#" + echo "# /sys/class/net/$ifname:" + echo "auto $ifname" + echo "iface $ifname inet dhcp";; + esac + fi + done + } >"$config_root/etc/network/interfaces" + # + # Finally rewrite /etc/motd + { echo "Host name: $host" + echo "Domain name: $domain" + echo "Network boot method: $boot" + case "$boot" in + static) echo "Host IP address: $ip";; + esac + echo "Use 'sysconf init' to reset the configuration" + echo "Use 'sysconf save' to save the configuration permanently" + echo "Use 'sysconf restore' to restore a previously saved configuration" + echo "Use 'sysconf help' for more information" + } >"$config_root/etc/motd" +} + +# +# sysconf_save_conffiles +# preserve the configuration files in a directory or in a CPIO archive +# (which is *not* compressed). If is a directory the files are +# copied, otherwise a CPIO archive is made with that name. is +# the listing file giving the preserved files and the processing option. +sysconf_save_conffiles(){ + local ffsdir dest list file + ffsdir="$1" + saved="$2" + list="$3" + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -n "$saved" -a -n "$list" || { + echo "sysconf_save_conffiles: invalid arguments: '$*'" >&2 + echo " usage sysconf_save_conffiles " >&2 + return 1 + } + # + ( cd "$ffsdir" + find etc/*.conf $(sed 's!^/!!' usr/lib/ipkg/info/*.conffiles) ! -type d -newer etc/.configured -print | + sed 's/^/diff /' + exec sed 's/#.*$//;/^[ ]*$/d' etc/default/conffiles + ) | sed 's!^/*!!' | + awk '{ op=$1; $1=""; file[$0]=op } + END{ for (f in file) if (file[f] != "ignore") print file[f] f }' | + while read op file + do + if test -e "$ffsdir/$file" + then + echo "$op $file" >&3 + echo "$file" + fi + done 3>"$list" | ( + cd "$ffsdir" + if test -d "$saved" + then + exec cpio -p -d -m -u "$saved" + else + exec cpio -o -H crc >"$saved" + fi + ) +} + +# +# sysconf_verify file +# this is called with the name of a 'diff' file which is, indeed, +# different and with all the std streams connected to the tty. It +# returns a status code to say whether (0) or not (1) to copy the +# file over. +# +# globals: the following must be defined in the calling context! +# saved: the directory containing the unpacked saved files +# ffsdir: the flash directory to which the files are being restored (/) +# +sysconf_verify_help() { + echo "Please specify how to handle this file or link, the options are as follows," + echo "two character abbreviations may be used:" + echo + echo " keep: retain the old file, overwrite the new flash image file" + echo " upgrade: retain the new file, the old (saved) file is not used" + echo " diff: display the differences between the old and the new using diff -u" + echo " shell: temporarily start an interactive shell (sh -i), exit to continue" + echo " skip: ignore this file for the moment. The file is left in the directory" + echo " $saved and many be handled after this script has completed" +} +# +sysconf_verify() { + local command file + + # return 1 here causes the file not to be overwritten, + # control should never get here! + test -n "$sysconf_noninteractive" && { + echo "$0: $*: changed file cannot be handled non-interactively" >&2 + return 1 + } + + file="$1" + echo "$0: $file: configuration file changed." + sysconf_verify_help "$file" + while : + do + echo -n "option: " + read command + case "$command" in + ke*) return 0;; + up*) rm "$saved/$file" + return 1;; + di*) echo "DIFF OLD($saved) NEW($ffsdir)" + diff -u "$saved/$file" "$ffsdir/$file";; + sh*) PS1="$file: " sh -i;; + sk*) return 1;; + *) sysconf_verify_help "$file";; + esac + done +} +# the same, but for a link +sysconf_verify_link() { + local command link + + # return 1 here causes the file not to be overwritten, + # control should never get here! + test -n "$sysconf_noninteractive" && { + echo "$0: $*: changed link cannot be handled non-interactively" >&2 + return 1 + } + + link="$1" + echo "reflash: $link: configuration link changed." + sysconf_verify_help "$link" + while : + do + echo -n "option: " + read command + case "$command" in + ke*) return 0;; + up*) rm "$saved/$link" + return 1;; + di*) echo "DIFF:" + echo "OLD($saved): $link -> $(readlink "$saved/$link")" + echo "NEW($ffsdir): $link -> $(readlink "$ffsdir/$link")";; + sh*) PS1="$link: " sh -i;; + sk*) return 1;; + *) sysconf_verify_help "$link";; + esac + done +} + +# +# sysconf_restore_conffiles +# restore the configuration files from a directory. 'source-dir' +# If is a directory of files from sysconf_save_conffiles. The +# list of files restored is written to the third argument (restore), +# but is not required (/dev/null would be ok). +# +# the list of files to restore is read from stdin, along with the +# processing option for each file (the format is as produced by +# sysconf_save_conffiles in the 'list' output). +sysconf_restore_conffiles(){ + local ffsdir saved restore + # these are the globals used by the above function + ffsdir="$1" + saved="$2" + restore="$3" + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -d "$saved" -a -n "$restore" || { + echo "restore_conffiles: invalid arguments: '$*'" >&2 + echo " usage sysconf_restore_conffiles " >&2 + return 1 + } + # + # read the list and process each given file + while read op file + do + # handle .configured specially (to preserve the original datestamp) + if test "$file" = "etc/.configured" + then + # this should definately not fail because of the test above! + if cp -a "$saved/$file" "$ffsdir/$file" + then + echo "$file" >&3 + else + echo "sysconf_restore_conffiles: $file: timestamp copy failed (ignored)" >&2 + fi + elif test -h "$saved/file" -o -h "$ffsdir/$file" + then + # new or old symbolic link + if test -h "$saved/$file" -a -h "$ffsdir/$file" && + test "$(readlink "$saved/$file")" = "$(readlink "$ffsdir/$file")" + then + # no change + echo "$file" >&3 + else + # assume a change regardless + case "$op" in + preserve) + echo "$file" + echo "$file" >&3;; + diff) # need user input + if sysconf_verify_link "$file" <>/dev/tty >&0 2>&0 + then + echo "$file" + echo "$file" >&3 + fi;; + esac + fi + else + # only overwrite if necessary + if test -e "$ffsdir/$file" && cmp -s "$saved/$file" "$ffsdir/$file" + then + # do not overwrite + echo "$file" >&3 + elif test ! -e "$ffsdir/$file" + then + # always preserve + echo "$file" + echo "$file" >&3 + else + case "$op" in + preserve) + echo "$file" + echo "$file" >&3;; + diff) # the files are different, get user input + if sysconf_verify "$file" <>/dev/tty >&0 2>&0 + then + echo "$file" + echo "$file" >&3 + fi;; + esac + fi + fi + done 3>"$restore" | (cd "$saved"; exec cpio -p -d -u "$ffsdir") +} + +# +# sysconf_test_restore +# return true only if the restore does not need to do an interactive +# compare +sysconf_test_restore(){ + local ffsdir saved + # these are the globals used by the above function + ffsdir="$1" + saved="$2" + # this is an error case, but return 0 so that the error is + # detected later + test -n "$ffsdir" -a -r "$ffsdir/etc/default/conffiles" -a -d "$saved" || + return 0 + # + # read the list and check each diff file (this is just a copy of the + # logic above with all the work removed!) + while read op file + do + # handle .configured specially (to preserve the original datestamp) + if test "$op" != diff + then + : # no diff required + elif test "$file" = "etc/.configured" + then + : # special handling + elif test -h "$saved/file" -o -h "$ffsdir/$file" + then + # new or old symbolic link + if test -h "$saved/$file" -a -h "$ffsdir/$file" && + test "$(readlink "$saved/$file")" = "$(readlink "$ffsdir/$file")" + then + : # no change + else + # assume a change regardless + return 1 + fi + else + # only overwrite if necessary + if test -e "$ffsdir/$file" && cmp -s "$saved/$file" "$ffsdir/$file" + then + : # do not overwrite + elif test ! -e "$ffsdir/$file" + then + : # always preserve + else + # a change + return 1 + fi + fi + done + + return 0 +} + +# +# mountflash "flash device" "flash root directory" {mount options} +# Finds and mounts the flash file system on the given directory +mountflash(){ + local ffsdev ffsdir + + ffsdev="$1" + test -n "$ffsdev" -a -b "$ffsdev" || { + echo "$0: unable to find flash file system to copy ($ffsdev)" >&2 + return 1 + } + shift + + ffsdir="$1" + test -n "$ffsdir" -a -d "$ffsdir" || { + echo "$0: mountflash $ffsdir: not a directory (internal error)" >&2 + return 1 + } + shift + + mount -t jffs2 "$@" "$ffsdev" "$ffsdir" || { + echo "$0: $ffsdev: unable to mount flash file system on $ffsdir" >&2 + return 1 + } + return 0 +} + +# +# umountflash [-r] "flash device" +# unmount any instance of the given flash device, if -r is specified a mount on +# root is an error, otherwise a mount on root is ignored (and remains). +umountflash(){ + local rootok ffsno ffsdev + rootok=1 + case "$1" in + -r) rootok= + shift;; + esac + # + # The argument is ffsdev + ffsdev="$1" + ffsno="$(devio "<<$ffsdev" prd)" + test -n "$ffsno" -a "$ffsno" -ge 0 || { + echo "$0: $ffsdev: device number $ffsno is not valid, cannot continue." >&2 + return 1 + } + # + # Make sure that Flashdisk isn't mounted on / + if test -z "$rootok" -a "$(devio "<&2 + return 1 + fi + # + # The function is currently always used interactively, so output + echo "$0: umounting any existing mount of $ffsdev" >&2 + # + # check each mount point, do this last first because otherwise nested + # mounts of ffsdev cannot be umounted. + ffs_umount() { + local device mp type options stuff + + read device mp type options stuff + test -z "$device" && return 0 + + # handle following entries first + ffs_umount || return 1 + + # handle this entry, since this is currently only used for unmounting + # the flash root partition we know a file which must exist... + case "$mp/$type" in + //jffs2);; # skip / + */jffs2)test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" || + umount "$mp" || { + echo "$0: $mp: unable to umount $ffsdev" >&2 + return 1 + };; + esac + + return 0 + } + # + ffs_umount &2 + return 1 + } + + return 0 +} + +# +# sysconf_save +# save the system configuration to $syspart - $syspart must exist and +# there must be a writeable device for it. +sysconf_save(){ + local sysdev ffsdev ffsdir saved list size status + ffsdev="$(mtblockdev $ffspart)" + sysdev="$(mtblockdev $syspart)" + status=1 + if test -n "$sysdev" -a -b "$sysdev" -a -n "$ffsdev" -a -b "$ffsdev" + then + # this will succeed silently if the flash device is on / + umountflash "$ffsdev" || exit 1 + # + # Everything is umounted, now remount on a temporary directory. + ffsdir="/tmp/flashdisk.$$" + mkdir "$ffsdir" || { + echo "$0: $ffsdir: failed to create temporary directory" >&2 + exit 1 + } + # + mountflash "$ffsdev" "$ffsdir" -o ro || { + rmdir "$ffsdir" + exit 1 + } + # need temporary files for the cpio output and the listing + saved=/tmp/cpio.$$ + list=/tmp/preserve.$$ + rm -rf "$saved" "$list" + sysconf_save_conffiles "$ffsdir" "$saved" "$list" || { + echo "$0: $saved: archive of saved configuration files failed" >&2 + rm -rf "$saved" + rm "$list" + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + return 1 + } + # ignore the error in this case: + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + # + # we now have: + # /etc/default/sysconf the basic config + # /tmp/preserve.$$ the list of saved files + # /tmp/cpio.$$ the CPIO archive of those files + # + # make one big file with the sysconf data followed by the + # compressed archive in /tmp/sysconf.$$ + { { cat /etc/default/sysconf + echo '[preserve]' + } | sed -n '1,/^\[preserve\]^/p' + while read op file + do + echo "$op"="$file" + done <"$list" + } >/tmp/sysconf.$$ + size="$(devio "<>/tmp/sysconf.$$ + # + # more cleanup, then try to write the new sysconf to $syspart + # the format is a 4 byte big-endian length then the text data + # if the data won't fit exit with error code 7 + rm "$saved" "$list" + devio -p "<>$sysdev" ' + $( $4+ # > + !! 7 + $) 0 + wb '"$size"',4 + cp $' + case $? in + 0) echo " done" >&2 + status=0;; + 1) echo " failed" >&2 + echo " $syspart could not be written (no changes made)" >&2;; + 3) echo " failed" >&2 + echo " $syspart partially written, you may want to reset it" >&2;; + 7) echo " failed" >&2 + echo " $syspart is too small: $size bytes required" >&2 + echo " No change made" >&2;; + *) echo " failed" >&2 + echo " Internal error writing $syspart" >&2;; + esac + # + rm -f /tmp/sysconf.$$ + else + echo "sysconf save: $syspart or $ffspart partition not found" >&2 + echo " A RedBoot partition named '$syspart' must exist in the system" >&2 + echo " flash memory for this command to work, and there must be a" >&2 + echo " block device to access this partition (udev will normally" >&2 + echo " create this automatically. The flash partition contents must" >&2 + echo " also be accessible in a partition called '$ffspart'" >&2 + echo + echo " To create the $syspart partition use the 'fis create' command" >&2 + echo " in the RedBoot boot loader, it is sufficient to make the" >&2 + echo " partition one erase block in size unless you have substantially" >&2 + echo " increased the size of the files listed in /etc/default/conffiles" >&2 + fi + + return $status +} + +# +# sysconf_restore [auto] +# restore previously saved configuration information from $syspart +sysconf_restore_error(){ + local root + root="$1" + shift + # ------------------------------------------------------------------------------- + { echo " WARNING: saved configuration files not restored" + test -n "$1" && echo "$*" + echo + echo "The configuration of this machine has been reinitialised using the values" + echo "from /etc/default/sysconf, however configuration files saved in the $syspart" + echo "partition have not been restored." + echo + echo "You can restore these files by correcting any reported errors then running" + echo + echo " sysconf restore" + echo + echo "from the command line. This will completely reinitialise the configuration" + echo "using the information in the $syspart partition." + } >"$root/etc/motd" + cat "$root/etc/motd" >&2 +} +# +sysconf_restore(){ + local sysdev ffsdev ffsdir saved restore size status sysconf_noninteractive config_root + + # if set this means 'do no diff' - this avoids the code above which + # would open /dev/tty and therefore allows this stuff to be done from + # an init script + sysconf_noninteractive= + test "$1" = auto && sysconf_noninteractive=1 + + ffsdev="$(mtblockdev $ffspart)" + sysdev="$(mtblockdev $syspart)" + status=1 + if test -n "$sysdev" -a -b "$sysdev" -a -n "$ffsdev" -a -b "$ffsdev" && + sysconf_valid + then + # this will succeed silently if the flash device is on / + umountflash "$ffsdev" || exit 1 + # + # Everything is umounted, now remount on a temporary directory. + ffsdir="/tmp/flashdisk.$$" + config_root="$ffsdir" + mkdir "$ffsdir" || { + echo "$0: $ffsdir: failed to create temporary directory" >&2 + exit 1 + } + # + mountflash "$ffsdev" "$ffsdir" || { + rmdir "$ffsdir" + exit 1 + } + # + # first restore the $syspart section + sysconf_read "$ffsdir" || sysconf_default "$ffsdir" + # + # now use this to regenerate the system files + sysconf_reload "$ffsdir" + # + # now examine the [preserve] section, if it is there restore + # it if possible. + if test -n "$(syssection preserve)" + then + # 'saved' is a directory, 'restore' is a file (which is + # used to detect unrestored files). The directory needs + # to be populated with files. + saved=/tmp/cpio.$$ + restore=/tmp/restore.$$ + rm -rf "$saved" "$restore" + # + mkdir "$saved" || { + sysconf_restore_error "$ffsdir" "$saved: failed to create temporary directory" + return 1 + } + # + # the CPIO archive is gzip compressed after the text part + # of sysconf, gzip will handle the LZ stream termination + # correctly (and break the pipe) so we don't need to know + # the real length of the data + devio "<<$sysdev" '<=b4+.' 'cp $s-' | gunzip | ( + cd "$saved" + exec cpio -i -d -m -u + ) || { + rm -rf "$saved" + sysconf_restore_error "$ffsdir" "$saved: cpio -i failed" + return 1 + } + # either there must be no 'diff' files or it must + # be possible to interact with a real user. + if test -z "$sysconf_noninteractive" || + syssection preserve | sysconf_test_restore "$ffsdir" "$saved" + then + # + # remove the 'init' motd from sysconf_reload + rm "$ffsdir/etc/motd" + # + # now restore from the directory, using the information in + # the preserve section, if this fails in a non-interactive + # setting the system might not reboot + syssection preserve | + sysconf_restore_conffiles "$ffsdir" "$saved" "$restore" || { + # there is a chance of the user cleaning this up +#------------------------------------------------------------------------------ + sysconf_restore_error "$ffsdir" \ +"$0: $saved: restore of saved configuration files failed. + The flash file system is mounted on $ffsdir. + The saved files are in $saved and the list of files selected for + restore is in $restore. + You should restore any required configuration from $saved, then umount + $ffsdir and reboot." + # this prevents cleanup/umount + return 1 + } + # + # remove the copied files (i.e. the ones which were preserved) + ( cd "$saved" + exec rm $(cat "$restore") + ) + rm "$restore" + # + # clean up, files left in $saved need to be handled by the user + files="$(find "$saved" ! -type d -print)" + if test -n "$files" + then +#------------------------------------------------------------------------------ + sysconf_restore_error "$ffsdir" \ +"$0: some saved configuration files have not been handled: + +$files + +These files can be examined in $saved and restored to +$ffsdir if required. The saved files are in a temporary +directory and will not be retained across a reboot - copy then elsewhere if +you are unsure whether they are needed." + return 1 + fi + # + # so this is safe now (no files, links etc) + rm -rf "$saved" + else + rm -rf "$saved" + # non-interactive and some changed diff files + sysconf_restore_error "$ffsdir" \ +"$0: some of the saved configuration files must be +examined before restoration" + # but continue to the umount + fi + fi + # + # ignore the error in this case: + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 + status=0 + else + echo "sysconf restore: $syspart or $ffspart partition not found" >&2 + echo " You must have used 'sysconf save' to save configuration data" >&2 + echo " into the $syspart partition before using this command. The command" >&2 + echo " will restore the configuration data to the flash root partition" >&2 + echo " named '$ffspart' - this must also be accessible." >&2 + fi + + return $status +} + +# +# read_one 'prompt' 'group' 'name' +# read a single value +read_one() { + local n o + o="$(sysval "$2" "$3")" + echo -n "$1 [$o]: " >/dev/tty + read n > /etc/hosts + ;; + dhcp) sed -i -e "s/localhost\$/localhost $disk_server_name/" /etc/hosts + ;; + *) bootproto=dhcp;; + esac + # + # The other stuff which cannot be changed + lan_interface="$(config iface)" + # + # Write this out to a new sysconf + { echo "[network]" + echo "lan_interface=$lan_interface" + test -n "$disk_server_name" && echo "disk_server_name=$disk_server_name" + test -n "$w_d_name" && echo "w_d_name=$w_d_name" + echo "bootproto=$bootproto" + case "$bootproto" in + static) echo "ip_addr=$ip_addr" + test -n "$netmask" && echo "netmask=$netmask" + test -n "$gateway" && echo "gateway=$gateway" + test -n "$dns_server1" && echo "dns_server1=$dns_server1" + test -n "$dns_server2" && echo "dns_server2=$dns_server2" + test -n "$dns_server3" && echo "dns_server3=$dns_server3" + ;; + esac + } >/etc/default/sysconf + # + # And reload the result + sysconf_reload + # + # The remove the spurious 'init' motd + rm /etc/motd +} + +# +# sysconf_help +# help text +sysconf_help(){ + # ------------------------------------------------------------------------------- + echo "sysconf: usage: sysconf init|read|default|reload|save|restore" >&2 + echo " init: initialise network information when DHCP is not available" >&2 + echo " read: the current $syspart partition is read into /etc/default/sysconf" >&2 + echo " default: a default /etc/default/sysconf is created" >&2 + echo " reload: system configuration files are recreated from /etc/default/sysconf" >&2 + echo " save: /etc/default/sysconf and the files listed in /etc/default/conffiles" >&2 + echo " are written to the $syspart partition" >&2 + echo " restore: the configuration information in the $syspart partition saved by" >&2 + echo " 'sysconf save' is restored" >&2 +} + +# +# the real commands +sysconf_command="$1" +test $# -gt 0 && shift +case "$sysconf_command" in +init) sysconf_init "$@";; +read) sysconf_read "$@";; +default)sysconf_default "$@";; +reload) sysconf_reload "$@";; +save) sysconf_save "$@";; +restore)sysconf_restore "$@";; +valid) sysconf_valid "$@";; + +sysconf)# just load the functions + ;; + +*) # help text + sysconf_help "$@";; +esac diff --git a/packages/sysconf/files/sysconfsetup b/packages/sysconf/files/sysconfsetup new file mode 100644 index 0000000000..7b91a0e331 --- /dev/null +++ b/packages/sysconf/files/sysconfsetup @@ -0,0 +1,59 @@ +#!/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 +# 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 "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 + } +} + +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/sysconf/sysconf_0.1.bb b/packages/sysconf/sysconf_0.1.bb new file mode 100644 index 0000000000..fd37cd01f7 --- /dev/null +++ b/packages/sysconf/sysconf_0.1.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "System Configuration save/restore functionality" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "devio cpio findutils diffutils" +PR = "r8" + +# Currently, the scripts only support ixp4xx machines. +# Feel free to add to the scripts ... +COMPATIBLE_MACHINE = '(ixp4xx|nslu2)' + +SRC_URI = "file://sysconfsetup \ + file://conffiles \ + file://sysconf \ + " + +SCRIPTS = "sysconf" +INITSCRIPTS = "sysconfsetup" + +# This just makes things easier... +S="${WORKDIR}" + +do_install() { + # Directories + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d \ + ${D}${base_sbindir} + + # Init scripts + install -m 0755 sysconfsetup ${D}${sysconfdir}/init.d/ + + # Configuration files + install -m 0644 conffiles ${D}${sysconfdir}/default + + # Shell scripts + install -m 0755 sysconf ${D}${base_sbindir}/sysconf +} + +pkg_postinst() { + opt= + test -n "$D" && opt="-r $D" + update-rc.d $opt sysconfsetup start 12 S . +} + +pkg_postrm() { + opt= + test -n "$D" && opt="-r $D" + update-rc.d $opt sysconfsetup remove +} + +CONFFILES = "${sysconfdir}/default/conffiles" -- cgit v1.2.3 From 039f604e475ef472d701bcfaca22b0098e1a8dea Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 11:39:27 +0000 Subject: arm-kernel-shim: Updated the configs, so that the console is listed first --- packages/arm-kernel-shim/arm-kernel-shim_1.3.bb | 2 +- packages/arm-kernel-shim/files/config-dsmg600.h | 2 +- packages/arm-kernel-shim/files/config-nas100d.h | 2 +- packages/arm-kernel-shim/files/config-nslu2.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb index 4014d9e866..339f663e25 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r4" +PR = "r5" COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h index 3203052d51..f8caccecd4 100644 --- a/packages/arm-kernel-shim/files/config-dsmg600.h +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE \ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 964 diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 846161d016..62c5556999 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 865 diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index d641523841..2b597c2b7f 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 597 -- cgit v1.2.3 From fd1d2273561a890605e83d657995b0e0771488ce Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 11:40:57 +0000 Subject: mokoslug: Added sysconf utility --- conf/distro/mokoslug.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index 5598694397..7278b62565 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -14,7 +14,7 @@ DISTRO_VERSION = "1.0-alpha" DISTRO_REVISION = "1" DISTRO_TYPE = "debug" -MACHINE_TASK_PROVIDER = "task-base task-mokogateway-everything" +MACHINE_TASK_PROVIDER = "task-base sysconf" # Even though the NSLU2 does not have built-in bluetooth, # we assume that a MokoSlug gateway has a bluetooth dongle. @@ -25,5 +25,3 @@ DEBUG_APPS_nslu2 = "" # No room for a kernel image on an NSLU2. IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;" - -INHERIT_append_nslu2 = "nslu2-image" \ No newline at end of file -- cgit v1.2.3 From ef45e99c4cd8b2c979d05af13632f2dbb3978c66 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 27 Mar 2007 09:53:29 +0000 Subject: tzcode-native: Replace unfetchable 2007c with 2007d. --- packages/tzcode/tzcode-native_2007c.bb | 21 --------------------- packages/tzcode/tzcode-native_2007d.bb | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 packages/tzcode/tzcode-native_2007c.bb create mode 100644 packages/tzcode/tzcode-native_2007d.bb diff --git a/packages/tzcode/tzcode-native_2007c.bb b/packages/tzcode/tzcode-native_2007c.bb deleted file mode 100644 index aed4253e81..0000000000 --- a/packages/tzcode/tzcode-native_2007c.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" - -PR = "r2" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ - ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -inherit native - -do_stage () { - install -d ${STAGING_BINDIR_NATIVE} - install -m 755 zic ${STAGING_BINDIR_NATIVE}/ - install -m 755 zdump ${STAGING_BINDIR_NATIVE}/ - install -m 755 tzselect ${STAGING_BINDIR_NATIVE}/ -} - -do_install () { - : -} diff --git a/packages/tzcode/tzcode-native_2007d.bb b/packages/tzcode/tzcode-native_2007d.bb new file mode 100644 index 0000000000..8e721d6d9a --- /dev/null +++ b/packages/tzcode/tzcode-native_2007d.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" + +PR = "r0" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ + ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +inherit native + +do_stage () { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 zic ${STAGING_BINDIR_NATIVE}/ + install -m 755 zdump ${STAGING_BINDIR_NATIVE}/ + install -m 755 tzselect ${STAGING_BINDIR_NATIVE}/ +} + +do_install () { + : +} -- cgit v1.2.3 From 20f234ec25f14c0a2ac1d23ddd079530fcc392b1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 27 Mar 2007 09:56:53 +0000 Subject: tzdata: replace unfetchable 2007c with 2007d --- packages/tzdata/tzdata_2007c.bb | 158 ---------------------------------------- packages/tzdata/tzdata_2007d.bb | 158 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 158 deletions(-) delete mode 100644 packages/tzdata/tzdata_2007c.bb create mode 100644 packages/tzdata/tzdata_2007d.bb diff --git a/packages/tzdata/tzdata_2007c.bb b/packages/tzdata/tzdata_2007c.bb deleted file mode 100644 index 1e8ff25137..0000000000 --- a/packages/tzdata/tzdata_2007c.bb +++ /dev/null @@ -1,158 +0,0 @@ -DESCRIPTION = "Timezone data" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "tzcode-native" - -PR = "r1" - -PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -RPROVIDES = "tzdata" -RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic \ - timezone-australia timezone-europe timezone-indian \ - timezone-iso3166.tab timezone-pacific timezone-zone.tab" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -TZONES= "africa antarctica asia australasia europe northamerica southamerica \ - factory solar87 solar88 solar89 etcetera backward systemv \ -# pacificnew \ - " - -do_compile () { - for zone in ${TZONES}; do \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - done -} - -do_install () { - install -d ${D}/usr ${D}${datadir}/zoneinfo - cp -pPR ${S}/usr ${D}/ -} - -# Packages primarily organized by directory with a major city -# in most time zones in the base package - -PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" - -FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" -RPROVIDES_tzdata-africa = "tzdata-africa" - -FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ - ${datadir}/zoneinfo/US/* \ - ${datadir}/zoneinfo/Brazil/* \ - ${datadir}/zoneinfo/Canada/* \ - ${datadir}/zoneinfo/Mexico/* \ - ${datadir}/zoneinfo/Chile/*" -RPROVIDES_tzdata-americas = "tzdata-americas" - -FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" -RPROVIDES_tzdata-antarctica = "tzdata-antarctica" - -FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" -RPROVIDES_tzdata-arctic = "tzdata-arctic" - -FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ - ${datadir}/zoneinfo/Indian/* \ - ${datadir}/zoneinfo/Mideast/*" -RPROVIDES_tzdata-asia = "tzdata-asia" - -FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" -RPROVIDES_tzdata-atlantic = "tzdata-atlantic" - -FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" -RPROVIDES_tzdata-australia = "tzdata-australia" - -FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" -RPROVIDES_tzdata-europe = "tzdata-europe" - -FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" -RPROVIDES_tzdata-pacific = "tzdata-pacific" - -FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" -RPROVIDES_tzdata-posix = "tzdata-posix" - -FILES_tzdata-right += "${datadir}/zoneinfo/right/*" -RPROVIDES_tzdata-right = "tzdata-right" - - -FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ - ${datadir}/zoneinfo/Egypt \ - ${datadir}/zoneinfo/Eire \ - ${datadir}/zoneinfo/Factory \ - ${datadir}/zoneinfo/GB-Eire \ - ${datadir}/zoneinfo/Hongkong \ - ${datadir}/zoneinfo/Iceland \ - ${datadir}/zoneinfo/Iran \ - ${datadir}/zoneinfo/Israel \ - ${datadir}/zoneinfo/Jamaica \ - ${datadir}/zoneinfo/Japan \ - ${datadir}/zoneinfo/Kwajalein \ - ${datadir}/zoneinfo/Libya \ - ${datadir}/zoneinfo/Navajo \ - ${datadir}/zoneinfo/Poland \ - ${datadir}/zoneinfo/Portugal \ - ${datadir}/zoneinfo/Singapore \ - ${datadir}/zoneinfo/Turkey" -RPROVIDES_tzdata-misc = "tzdata-misc" - - -FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ - ${datadir}/zoneinfo/America/Anchorage \ - ${datadir}/zoneinfo/America/Los_Angeles \ - ${datadir}/zoneinfo/America/Denver \ - ${datadir}/zoneinfo/America/Chicago \ - ${datadir}/zoneinfo/America/New_York \ - ${datadir}/zoneinfo/America/Caracas \ - ${datadir}/zoneinfo/America/Sao_Paulo \ - ${datadir}/zoneinfo/Europe/London \ - ${datadir}/zoneinfo/Europe/Paris \ - ${datadir}/zoneinfo/Africa/Cairo \ - ${datadir}/zoneinfo/Europe/Moscow \ - ${datadir}/zoneinfo/Asia/Dubai \ - ${datadir}/zoneinfo/Asia/Karachi \ - ${datadir}/zoneinfo/Asia/Dhaka \ - ${datadir}/zoneinfo/Asia/Bankok \ - ${datadir}/zoneinfo/Asia/Hong_Kong \ - ${datadir}/zoneinfo/Asia/Tokyo \ - ${datadir}/zoneinfo/Australia/Sydney \ - ${datadir}/zoneinfo/Pacific/Noumea \ - ${datadir}/zoneinfo/CET \ - ${datadir}/zoneinfo/CST6CDT \ - ${datadir}/zoneinfo/EET \ - ${datadir}/zoneinfo/EST \ - ${datadir}/zoneinfo/EST5EDT \ - ${datadir}/zoneinfo/GB \ - ${datadir}/zoneinfo/GMT \ - ${datadir}/zoneinfo/GMT+0 \ - ${datadir}/zoneinfo/GMT-0 \ - ${datadir}/zoneinfo/GMT0 \ - ${datadir}/zoneinfo/Greenwich \ - ${datadir}/zoneinfo/HST \ - ${datadir}/zoneinfo/MET \ - ${datadir}/zoneinfo/MST \ - ${datadir}/zoneinfo/MST7MDT \ - ${datadir}/zoneinfo/NZ \ - ${datadir}/zoneinfo/NZ-CHAT \ - ${datadir}/zoneinfo/PRC \ - ${datadir}/zoneinfo/PST8PDT \ - ${datadir}/zoneinfo/ROC \ - ${datadir}/zoneinfo/ROK \ - ${datadir}/zoneinfo/UCT \ - ${datadir}/zoneinfo/UTC \ - ${datadir}/zoneinfo/Universal \ - ${datadir}/zoneinfo/W-SU \ - ${datadir}/zoneinfo/WET \ - ${datadir}/zoneinfo/Zulu \ - ${datadir}/zoneinfo/Etc/*" diff --git a/packages/tzdata/tzdata_2007d.bb b/packages/tzdata/tzdata_2007d.bb new file mode 100644 index 0000000000..46d941c269 --- /dev/null +++ b/packages/tzdata/tzdata_2007d.bb @@ -0,0 +1,158 @@ +DESCRIPTION = "Timezone data" +SECTION = "base" +PRIORITY = "optional" +DEPENDS = "tzcode-native" + +PR = "r0" + +PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" +RPROVIDES = "tzdata" +RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ + timezone-arctic timezone-asia timezone-atlantic \ + timezone-australia timezone-europe timezone-indian \ + timezone-iso3166.tab timezone-pacific timezone-zone.tab" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +TZONES= "africa antarctica asia australasia europe northamerica southamerica \ + factory solar87 solar88 solar89 etcetera backward systemv \ +# pacificnew \ + " + +do_compile () { + for zone in ${TZONES}; do \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + done +} + +do_install () { + install -d ${D}/usr ${D}${datadir}/zoneinfo + cp -pPR ${S}/usr ${D}/ +} + +# Packages primarily organized by directory with a major city +# in most time zones in the base package + +PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" + +FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" +RPROVIDES_tzdata-africa = "tzdata-africa" + +FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ + ${datadir}/zoneinfo/US/* \ + ${datadir}/zoneinfo/Brazil/* \ + ${datadir}/zoneinfo/Canada/* \ + ${datadir}/zoneinfo/Mexico/* \ + ${datadir}/zoneinfo/Chile/*" +RPROVIDES_tzdata-americas = "tzdata-americas" + +FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" +RPROVIDES_tzdata-antarctica = "tzdata-antarctica" + +FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" +RPROVIDES_tzdata-arctic = "tzdata-arctic" + +FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ + ${datadir}/zoneinfo/Indian/* \ + ${datadir}/zoneinfo/Mideast/*" +RPROVIDES_tzdata-asia = "tzdata-asia" + +FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" +RPROVIDES_tzdata-atlantic = "tzdata-atlantic" + +FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" +RPROVIDES_tzdata-australia = "tzdata-australia" + +FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" +RPROVIDES_tzdata-europe = "tzdata-europe" + +FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" +RPROVIDES_tzdata-pacific = "tzdata-pacific" + +FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" +RPROVIDES_tzdata-posix = "tzdata-posix" + +FILES_tzdata-right += "${datadir}/zoneinfo/right/*" +RPROVIDES_tzdata-right = "tzdata-right" + + +FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ + ${datadir}/zoneinfo/Egypt \ + ${datadir}/zoneinfo/Eire \ + ${datadir}/zoneinfo/Factory \ + ${datadir}/zoneinfo/GB-Eire \ + ${datadir}/zoneinfo/Hongkong \ + ${datadir}/zoneinfo/Iceland \ + ${datadir}/zoneinfo/Iran \ + ${datadir}/zoneinfo/Israel \ + ${datadir}/zoneinfo/Jamaica \ + ${datadir}/zoneinfo/Japan \ + ${datadir}/zoneinfo/Kwajalein \ + ${datadir}/zoneinfo/Libya \ + ${datadir}/zoneinfo/Navajo \ + ${datadir}/zoneinfo/Poland \ + ${datadir}/zoneinfo/Portugal \ + ${datadir}/zoneinfo/Singapore \ + ${datadir}/zoneinfo/Turkey" +RPROVIDES_tzdata-misc = "tzdata-misc" + + +FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ + ${datadir}/zoneinfo/America/Anchorage \ + ${datadir}/zoneinfo/America/Los_Angeles \ + ${datadir}/zoneinfo/America/Denver \ + ${datadir}/zoneinfo/America/Chicago \ + ${datadir}/zoneinfo/America/New_York \ + ${datadir}/zoneinfo/America/Caracas \ + ${datadir}/zoneinfo/America/Sao_Paulo \ + ${datadir}/zoneinfo/Europe/London \ + ${datadir}/zoneinfo/Europe/Paris \ + ${datadir}/zoneinfo/Africa/Cairo \ + ${datadir}/zoneinfo/Europe/Moscow \ + ${datadir}/zoneinfo/Asia/Dubai \ + ${datadir}/zoneinfo/Asia/Karachi \ + ${datadir}/zoneinfo/Asia/Dhaka \ + ${datadir}/zoneinfo/Asia/Bankok \ + ${datadir}/zoneinfo/Asia/Hong_Kong \ + ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Sydney \ + ${datadir}/zoneinfo/Pacific/Noumea \ + ${datadir}/zoneinfo/CET \ + ${datadir}/zoneinfo/CST6CDT \ + ${datadir}/zoneinfo/EET \ + ${datadir}/zoneinfo/EST \ + ${datadir}/zoneinfo/EST5EDT \ + ${datadir}/zoneinfo/GB \ + ${datadir}/zoneinfo/GMT \ + ${datadir}/zoneinfo/GMT+0 \ + ${datadir}/zoneinfo/GMT-0 \ + ${datadir}/zoneinfo/GMT0 \ + ${datadir}/zoneinfo/Greenwich \ + ${datadir}/zoneinfo/HST \ + ${datadir}/zoneinfo/MET \ + ${datadir}/zoneinfo/MST \ + ${datadir}/zoneinfo/MST7MDT \ + ${datadir}/zoneinfo/NZ \ + ${datadir}/zoneinfo/NZ-CHAT \ + ${datadir}/zoneinfo/PRC \ + ${datadir}/zoneinfo/PST8PDT \ + ${datadir}/zoneinfo/ROC \ + ${datadir}/zoneinfo/ROK \ + ${datadir}/zoneinfo/UCT \ + ${datadir}/zoneinfo/UTC \ + ${datadir}/zoneinfo/Universal \ + ${datadir}/zoneinfo/W-SU \ + ${datadir}/zoneinfo/WET \ + ${datadir}/zoneinfo/Zulu \ + ${datadir}/zoneinfo/Etc/*" -- cgit v1.2.3 From 2f9ed18e211a6aceb79bcc3e0958cb862894226a Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 27 Mar 2007 10:18:09 +0000 Subject: libsdl-directfb: lower preference, depends on directfb which fails to build. --- packages/libsdl/libsdl-directfb_1.2.9.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/libsdl/libsdl-directfb_1.2.9.bb b/packages/libsdl/libsdl-directfb_1.2.9.bb index 9145f5ad31..aa089e0ecb 100644 --- a/packages/libsdl/libsdl-directfb_1.2.9.bb +++ b/packages/libsdl/libsdl-directfb_1.2.9.bb @@ -6,6 +6,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" PR = "r1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ -- cgit v1.2.3 From 1ed622eced613ef83ac842e78d23bacbdc6e9171 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 13:38:24 +0000 Subject: cpio: Move cpio from /usr/bin to /bin and use update-alternatives to select it in preference to the busybox cpio. --- packages/cpio/cpio_2.5.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb index 9762b2e764..c21a59a44a 100644 --- a/packages/cpio/cpio_2.5.bb +++ b/packages/cpio/cpio_2.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GNU cpio is a program to manage archives of files." HOMEPAGE = "http://www.gnu.org/software/cpio/" SECTION = "console" LICENSE = "GPL" -PR = "r3" +PR = "r4" DEPENDS += " texinfo-native " @@ -14,16 +14,20 @@ inherit autotools do_install () { autotools_do_install + install -d ${D}${base_bindir}/ + mv ${D}${bindir}/cpio ${D}${base_bindir}/cpio.${PN} mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN} } pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/cpio cpio cpio.${PN} 100 update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50 } pkg_prerm_${PN} () { + update-alternatives --remove cpio cpio.${PN} update-alternatives --remove rmt rmt.${PN} } -- cgit v1.2.3 From 04dd5164a7a07d9ca2b07385551f0e1c6a31535b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 26 Mar 2007 01:06:34 +0000 Subject: task-slugos: Made rng-tools conditional on not uclibc --- packages/tasks/task-slugos.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 92820e069c..99b9ea44ae 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -68,9 +68,12 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " + # Add daemon required for HW RNG support +SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools" +SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = "" SLUGOS_STANDARD_RRECOMMENDS += "\ -rng-tools \ +${SLUGOS_RNG_TOOLS_PACKAGE} \ " # Add modules required for usb support -- cgit v1.2.3 From b2baa20455ce4ddd908c8e95b62a40465c7000a5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 27 Mar 2007 16:24:49 +0000 Subject: ipkg-collateral: Should be marked as machine specific since it uses machine specific file overrides --- packages/ipkg/ipkg-collateral.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb index cfe7d71c2d..244d29d08a 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -1,8 +1,8 @@ DESCRIPTION = "ipkg configuration files" SECTION = "base" LICENSE = "MIT" -PR = "r6" -PACKAGE_ARCH = "all" +PR = "r7" +PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = " \ file://ipkg.conf.comments \ -- cgit v1.2.3 From b566a6e647b2c769a2e3c431ab7d76727bc77243 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 27 Mar 2007 17:56:24 +0000 Subject: openpbx: Update openpbx.org, thanks to hillct --- packages/openpbx/openpbx.org_1.2_rc3.bb | 35 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/packages/openpbx/openpbx.org_1.2_rc3.bb b/packages/openpbx/openpbx.org_1.2_rc3.bb index 76c1f0c7bd..e343eb8729 100644 --- a/packages/openpbx/openpbx.org_1.2_rc3.bb +++ b/packages/openpbx/openpbx.org_1.2_rc3.bb @@ -1,6 +1,10 @@ DESCRIPTION = "A flexible VOIP soft switch/PBX." +DESCRIPTION_${PN}-ogi = "OpenPBX Gateway Inerface for scripted PBX call processing" +DESCRIPTION_${PN}-fax = "Fax send/receive file and T.38 support for OpenPBX" +DESCRIPTION_${PN}-ldap = "LDAP Directory services interface for OpenPBX" +DESCRIPTION_${PN}-sounds = "Standard set of audio prompts for OpenPBX" HOMEPAGE = "http://www.openpbx.org" -#RDEPENDS = "ssmtp" +RDEPENDS = "ssmtp" SECTION = "voip" LICENSE = "GPL" DEPENDS = "openssl zlib tiff libcap spandsp speex readline js \ @@ -9,7 +13,7 @@ DEPENDS_${PN}-ldap = "openldap" RRECOMMENDS = "logrotate" RRECOMMENDS_${PN}-ogi = "perl perl-module-strict openpbx.org-perl" PV = "1.2_rc3" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \ svn://svn.openpbx.org/openpbx-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=svn \ @@ -26,10 +30,10 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \ - --disable-zaptel --with-directory-layout=lsb --with-chan_fax \ + --disable-zaptel --with-directory-layout=lsb --enable-t38 \ --with-codec-speex=${STAGING_DIR}/${HOST_SYS} --with-app_ldap \ --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \ - --enable-t38 --with-javascript --with-res_js \ + --with-javascript --with-res_js \ --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \ --includedir=${includedir} --infodir=${infodir} --mandir=${mandir} \ --localstatedir=${localstatedir} --libdir=${libdir}" @@ -69,11 +73,10 @@ FILES_${PN}-sounds = "${datadir}/openpbx.org/sounds/*" FILES_${PN}-dev = "${libdir}/openpbx.org/modules/*.la \ ${libdir}/openpbx.org/*.la \ ${includedir}/openpbx/*" -FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.so \ - ${libdir}/openpbx.org/modules/app_rxfax.so \ - ${libdir}/openpbx.org/modules/app_txfax.so \ +FILES_${PN}-fax = "${libdir}/openpbx.org/modules/app_backgrounddetect.so \ ${libdir}/openpbx.org/modules/app_faxdetect.so \ - ${sysconfdir}/openpbx.org/chan_fax.conf" + ${libdir}/openpbx.org/modules/app_rxfax.so \ + ${libdir}/openpbx.org/modules/app_txfax.so" FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.so \ ${datadir}/openpbx.org/ogi/*" FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*" @@ -81,11 +84,22 @@ FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*" pkg_postinst_prepend() { grep -q openpbx ${sysconfdir}/group || addgroup --system openpbx grep -q openpbx ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/openpbx.org --no-create-home --disabled-password --ingroup openpbx -s ${base_bindir}/false openpbx - chown -R openpbx:openpbx ${localstatedir}/lib/openpbx.org ${localstatedir}/spool/openpbx.org ${localstatedir}/log/openpbx.org ${localstatedir}/run/openpbx.org ${sysconfdir}/openpbx.org ${datadir}/openpbx.org + chown -R openpbx:openpbx ${libdir}/openpbx.org ${localstatedir}/lib/openpbx.org ${localstatedir}/spool/openpbx.org ${localstatedir}/log/openpbx.org ${localstatedir}/run/openpbx.org ${sysconfdir}/openpbx.org ${datadir}/openpbx.org /etc/init.d/populate-volatile.sh update } -CONFFILES_${PN}-fax += "${sysconfdir}/openpbx.org/chan_fax.conf" +pkg_postinst_${PN}-fax () { + chown -R openpbx:openpbx ${libdir}/openpbx.org +} + +pkg_postinst_${PN}-ldap () { + chown -R openpbx:openpbx ${libdir}/openpbx.org +} + +pkg_postinst_${PN}-sounds () { + chown -R openpbx:openpbx ${datadir}/openpbx.org +} + CONFFILES_${PN} += "${sysconfdir}/openpbx.org/musiconhold.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adsi.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adtranvofr.conf" @@ -99,6 +113,7 @@ CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dnsmgr.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dundi.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/enum.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extconfig.conf" +CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.ael" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/features.conf" CONFFILES_${PN} += "${sysconfdir}/openpbx.org/iax.conf" -- cgit v1.2.3 From 09b18d1fff43cef84dcaa8fa0723f0e38b92d5d1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 27 Mar 2007 17:58:00 +0000 Subject: apt-package.inc: disable magic that doesn't work and causes builds to fail. Disable oe_libinstall as well, since lib* got built statically * people that care about and/or know apt internals should fix this --- packages/apt/apt-package.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc index 43f54cadab..8bf2b56739 100644 --- a/packages/apt/apt-package.inc +++ b/packages/apt/apt-package.inc @@ -77,11 +77,11 @@ do_install () { install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so + #eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + #oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true + #ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so + #oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true + #ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so install -d ${D}${libdir}/apt/methods install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ -- cgit v1.2.3 From 1566696e78ee5757811d43ef5eae09bad406d050 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 27 Mar 2007 18:27:43 +0000 Subject: apt.inc: provide an example on how to provide the glibc version to configure --- packages/apt/apt.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc index b18ed93782..dbf5765205 100644 --- a/packages/apt/apt.inc +++ b/packages/apt/apt.inc @@ -8,3 +8,8 @@ S = "${WORKDIR}/apt-${PV}" inherit autotools gettext EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" + +# Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use +# Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4) +# Koen - 20070327 +EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4" -- cgit v1.2.3 From 84475325fed1cf7e271ac66b0fd9cb36532e4d4f Mon Sep 17 00:00:00 2001 From: Manuel Teira Date: Tue, 27 Mar 2007 18:31:20 +0000 Subject: xserver-kdrive: update imageon patch, closes #2052 --- .../xserver-kdrive/kdrive-imageon.patch | 66 +++++----------------- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 2 +- 2 files changed, 16 insertions(+), 52 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch index 86ab49e1b2..f4272f80e0 100644 --- a/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch +++ b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch @@ -6,6 +6,7 @@ # -XV Extension # -Internal and External Imageon offscreen memory support # -Hardware RandR rotation (without using a shadow framebuffer) +# -Support for RandR mode changing # # Patch managed by http://www.holgerschurig.de/patcher.html @@ -128,7 +129,7 @@ + $(FBDEV_LIBS) --- /dev/null +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon.c -@@ -0,0 +1,607 @@ +@@ -0,0 +1,606 @@ +/* + * Copyright © 2007 Manuel Teira + * @@ -419,14 +420,13 @@ + + w100c->hw_window.offset = W100_HOST2CARD(screen->fb[0].frameBuffer); + -+ -+ W100ComputeMouseMatrix(&m, screen->randr, -+ w100StartupInfo.portrait ? -+ W100_MIN(screen->width, screen->height) : -+ W100_MAX(screen->width, screen->height), -+ w100StartupInfo.portrait ? -+ W100_MAX(screen->width, screen->height) : -+ W100_MIN(screen->width, screen->height)); ++ KdComputeMouseMatrix(&m, screen->randr, ++ w100StartupInfo.portrait ? ++ W100_MIN(screen->width, screen->height) : ++ W100_MAX(screen->width, screen->height), ++ w100StartupInfo.portrait ? ++ W100_MAX(screen->width, screen->height) : ++ W100_MIN(screen->width, screen->height)); + + KdSetMouseMatrix(&m); + @@ -527,7 +527,7 @@ + screen->randr = randr; + screen->width = pScreen->width; + screen->height = pScreen->height; -+ w100c->hw_window.randr = KdAddRotation(randr, w100StartupInfo.randr); ++ w100c->hw_window.randr = KdSubRotation(w100StartupInfo.randr, randr); + w100c->hw_window.mode = W100GetBestMode(w100c, pScreen->width, pScreen->height); + + KdOffscreenSwapOut(screen->pScreen); @@ -902,7 +902,7 @@ +#endif --- /dev/null +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon_cursor.c -@@ -0,0 +1,563 @@ +@@ -0,0 +1,566 @@ +/* + * Copyright © 2007 Manuel Teira + * @@ -1157,6 +1157,7 @@ + (CARD32*) tmpCursor0, + (CARD32*) tmpCursor1); + ++ DUMP_CURSOR((CARD32*)tmpCursor1); + /* Correct endianness */ + src = (CARD32*) tmpCursor1; + dst = (CARD32*) (pCurPriv->area->vidmem->base + pCurPriv->area->offset); @@ -1275,6 +1276,7 @@ + W100CardInfo(pScreenPriv); + W100ScreenInfo(pScreenPriv); + W100Cursor *pCurPriv = &w100s->cursor; ++ DBG_IMAGEON(("W100RealizeCursor\n")); + + if (!pScreenPriv->enabled) { + return TRUE; @@ -1293,6 +1295,7 @@ +static Bool +W100UnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) +{ ++ DBG_IMAGEON(("W100UnrealizeCursor\n")); + return TRUE; +} + @@ -6228,7 +6231,7 @@ +} --- /dev/null +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon_support.c -@@ -0,0 +1,1477 @@ +@@ -0,0 +1,1438 @@ +/* + * Copyright © 2007 Manuel Teira + * @@ -7656,45 +7659,6 @@ + return TRUE; +} + -+void -+W100ComputeMouseMatrix(KdMouseMatrix *m, Rotation randr, int width, int height) -+{ -+ int x_dir = 1, y_dir = 1; -+ int i, j; -+ int size[2]; -+ -+ size[0] = width; size[1] = height; -+ if (randr & RR_Reflect_X) -+ x_dir = -1; -+ if (randr & RR_Reflect_Y) -+ y_dir = -1; -+ switch (randr & (RR_Rotate_All)) { -+ case RR_Rotate_0: -+ m->matrix[0][0] = x_dir; m->matrix[0][1] = 0; -+ m->matrix[1][0] = 0; m->matrix[1][1] = y_dir; -+ break; -+ case RR_Rotate_90: -+ m->matrix[0][0] = 0; m->matrix[0][1] = x_dir; -+ m->matrix[1][0] = -y_dir; m->matrix[1][1] = 0; -+ break; -+ case RR_Rotate_180: -+ m->matrix[0][0] = -x_dir; m->matrix[0][1] = 0; -+ m->matrix[1][0] = 0; m->matrix[1][1] = -y_dir; -+ break; -+ case RR_Rotate_270: -+ m->matrix[0][0] = 0; m->matrix[0][1] = -x_dir; -+ m->matrix[1][0] = y_dir; m->matrix[1][1] = 0; -+ break; -+ } -+ for (i = 0; i < 2; i++) -+ { -+ m->matrix[i][2] = 0; -+ for (j = 0 ; j < 2; j++) -+ if (m->matrix[i][j] < 0) -+ m->matrix[i][2] = size[j] - 1; -+ } -+} -+ +void W100TransformTsLibCoordinates(long *x, long *y, void *closure) +{ + W100CardInfo *w100c = closure; diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index e3fd09f602..fafad38b1a 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" -PR = "r8" +PR = "r9" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -- cgit v1.2.3 From 4ff882fcb5831da2b573900d295724e87eb5b954 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 27 Mar 2007 18:44:25 +0000 Subject: xserver-kdrive-imageon: bump PR of the right xserver --- packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb index 75b4a9956b..106d5405a6 100644 --- a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb @@ -11,7 +11,7 @@ DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -PR = "r0" +PR = "r1" FILESPATH = "${FILE_DIRNAME}/xserver-kdrive" -- cgit v1.2.3 From 14f7610da247ed0b20aaac405f80a69942379311 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 27 Mar 2007 21:26:31 +0000 Subject: foonas: use dtc snapshot, git is currently fudged. Thanks to timtimred --- conf/distro/include/foonas.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc index b904e15d5a..ad020b8501 100644 --- a/conf/distro/include/foonas.inc +++ b/conf/distro/include/foonas.inc @@ -50,3 +50,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" -- cgit v1.2.3 From 1944b83357f5afec7e0560124ddfcf81b8fc07a5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 27 Mar 2007 21:53:18 +0000 Subject: linux-linkstationppc: Upgrade to 2.6.21-rc5 --- packages/linux/linux-linkstationppc_2.6.21-rc4.bb | 43 ----------------------- packages/linux/linux-linkstationppc_2.6.21-rc5.bb | 42 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 packages/linux/linux-linkstationppc_2.6.21-rc4.bb create mode 100644 packages/linux/linux-linkstationppc_2.6.21-rc5.bb diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc4.bb b/packages/linux/linux-linkstationppc_2.6.21-rc4.bb deleted file mode 100644 index 0410c86706..0000000000 --- a/packages/linux/linux-linkstationppc_2.6.21-rc4.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc4" -SECTION = "kernel" -LICENSE = "GPL" -PR = "r0" - -DEPENDS = "dtc-native" - -COMPATIBLE_MACHINE = "linkstationppc" - -SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.21-rc4.bz2;patch=1 \ - file://defconfig \ - " - -S = "${WORKDIR}/linux-2.6.20" - -inherit kernel - -export ARCH="powerpc" - -KERNEL_IMAGETYPE = "uImage" - -FILES_kernel += "/boot/kuroboxHG.dtb \ - /boot/kuroboxHD.dtb" - -do_configure() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - ARCH=${ARCH} oe_runmake oldconfig -} - -do_install_append() { - dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHG.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHG.dts - dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHD.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHD.dts -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/vmlinux.UBoot -} - -do_deploy[dirs] = "${S}" - -addtask deploy before do_build after do_compile diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb new file mode 100644 index 0000000000..7a6efb0059 --- /dev/null +++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc5" +SECTION = "kernel" +LICENSE = "GPL" +PR = "r0" + +DEPENDS = "dtc-native" +COMPATIBLE_MACHINE = "(lsppchd|lsppchg)" + +SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ + http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.21-rc5.bz2;patch=1 \ + file://defconfig \ + " + +S = "${WORKDIR}/linux-2.6.20" + +inherit kernel + +export ARCH="powerpc" + +KERNEL_IMAGETYPE = "uImage" + +FILES_kernel-image += "/boot/kuroboxHG.dtb \ + /boot/kuroboxHD.dtb" + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + ARCH=${ARCH} oe_runmake oldconfig +} + +do_install_append() { + dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHG.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHG.dts + dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHD.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHD.dts +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/vmlinux.UBoot +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile -- cgit v1.2.3 From e55d052b8fe7279f2fc23944fd5dd75e743d1a4b Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 27 Mar 2007 22:22:45 +0000 Subject: altboot: Update to latest version --- .../altboot/files/altboot-menu/Advanced/55-bin-sh | 4 +- packages/altboot/files/altboot.func | 2 +- packages/altboot/files/init.altboot | 13 +- packages/altboot/files/nslu2le/.mtn2git_empty | 0 packages/altboot/files/nslu2le/altboot-2.6.cfg | 55 +++++++ .../files/nslu2le/altboot-handlers/.mtn2git_empty | 0 .../files/nslu2le/altboot-handlers/05-USB-Storage | 90 +++++++++++ .../nslu2le/altboot-handlers/10-Onboard-Flash | 18 +++ .../files/nslu2le/altboot-menu/.mtn2git_empty | 0 .../altboot/files/nslu2le/altboot-menu/00-Default | 17 ++ .../files/nslu2le/altboot-menu/30-bootUSB-Stick | 174 +++++++++++++++++++++ .../altboot/files/nslu2le/altboot-menu/55-bin-sh | 27 ++++ .../files/nslu2le/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/set-bootdev | 150 ++++++++++++++++++ 14 files changed, 546 insertions(+), 4 deletions(-) create mode 100644 packages/altboot/files/nslu2le/.mtn2git_empty create mode 100644 packages/altboot/files/nslu2le/altboot-2.6.cfg create mode 100644 packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty create mode 100644 packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage create mode 100644 packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash create mode 100644 packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty create mode 100644 packages/altboot/files/nslu2le/altboot-menu/00-Default create mode 100644 packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick create mode 100644 packages/altboot/files/nslu2le/altboot-menu/55-bin-sh create mode 100644 packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty create mode 100755 packages/altboot/files/set-bootdev diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh index 6c9aef3f3e..e4fe99ebae 100644 --- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh +++ b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh @@ -7,7 +7,7 @@ run_module() { test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/tty0 + test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/$OUT_TTY # Mount /proc, etc init_rootfs @@ -15,7 +15,7 @@ run_module() { echo -e "\nBoot system with 'exec /sbin/init 5'\n" while true do - exec $SH_SHELL /dev/tty0 2>&1 + exec $SH_SHELL /dev/$OUT_TTY 2>&1 echo "WARNING: Shell was killed!" done } diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index e990a06862..ae38c5b437 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -392,7 +392,7 @@ verify_master_pw() { test -e /etc/altboot.pwd && . /etc/altboot.pwd - if ! test -z "$MASTER_PASSWORD" + if test -n "$MASTER_PASSWORD" -a "$MASTER_PASSWORD" != "[none]" then auth_timeout="3" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 30868024b8..74200d1ec9 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -90,7 +90,7 @@ show_menu() { if ! test -d "$1/$file" then # NOTE: It is important to use "." here so that the script inherits - # the shell environment / all set variables! + # the shell environment / all set variables! M_TITLE="`. $1/$file title`" FLAGS="`$1/$file flags`" @@ -109,6 +109,8 @@ show_menu() { fi done +# debug_echo "FILES READ" + # Display directories below /etc/altboot-menu as menu-item # and add all scripts inside the directory to m_entry for dir in `ls -1` @@ -159,6 +161,8 @@ show_menu() { fi done +# debug_echo "DIRS READ" + echo "" } @@ -491,6 +495,7 @@ fi # The NSLU2 is an exception as it uses the way-ugly busybox "ps" # +mount | grep -q "^/proc" || mount -t proc proc /proc MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" case "$MACHINE" in @@ -507,6 +512,12 @@ case "$MACHINE" in ;; esac +if test "`basename "$0"`" = "altboot" +then + show_menu /etc/altboot-menu + exit 0 +fi + if test "$user_called" = "1" then echo "altboot: Using real init [$REAL_INIT] [$*] [`ps |wc -l|tr -d " "`] *" >"$OUT_TTY" diff --git a/packages/altboot/files/nslu2le/.mtn2git_empty b/packages/altboot/files/nslu2le/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/nslu2le/altboot-2.6.cfg b/packages/altboot/files/nslu2le/altboot-2.6.cfg new file mode 100644 index 0000000000..626c543085 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-2.6.cfg @@ -0,0 +1,55 @@ +# +# Altboot machine configuration for: NSLU2 / Kernel 2.6 +# + +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" + +# If set to "0" the menu will always be shown, if set to +# "[none]" there will be no menu and no delay +TIMEOUT="[none]" + +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" + +ENABLE_SOUND="no" + +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="yes" + + +# Can't do that due to missing console +ENABLE_IMAGECONF="no" + +SD_DEVICE="" +SD_KERNEL_MODULE="" + + +USB_HOST_AVAILABLE="yes" +USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" +USB_STORAGE_PARTITION="/dev/sda1" +USB_STORAGE_WAIT="4" + +USB_NETWORKING_AVAILABLE="no" +USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" +USB_NW_DEVICE="usb0" + +INIT_RUNLEVEL="3" +NO_GUI_RL="" + +# The if set to "", altboot will force you to set a master password on +# first-boot +MASTER_PASSWORD="[none]" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" + +DISABLE_SD_BOOT="yes" +DISABLE_CF_BOOT="yes" +DISABLE_NOGUI_BOOT="yes" +DISABLE_BINSH_BOOT="yes" +DISABLE_INSTTGZ_BOOT="yes" diff --git a/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage b/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage new file mode 100644 index 0000000000..50d35ed542 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage @@ -0,0 +1,90 @@ +#!/bin/sh +# NOTE: Ported to altboot by CoreDump +# Based on the original turnup helper script. +# +# All parts by Matthias 'CoreDump' Hentges are hereby placed +# under the terms of the GPL +# +# boot from the hard disk partition "$1" (which +# must be given) using options from the rest of +# the command line. +# + +M_TITLE="Boot USB Storage" +test "$USB_HOST_AVAILABLE" = "yes" || exit 0 + +run_module() { + x=x +} + +case "$1" in +title) echo "$M_TITLE" ; exit 0 ;; +run) run_module "$2";; +esac + +nslu2_feeback heartbeat + +bootdev_data="$*" +bootdev_mode="`echo "$bootdev_data" | awk '{print $1}'`" +bootdev_name="`echo "$bootdev_data" | awk '{print $2}'`" +bootdev_uuid="`echo "$bootdev_data" | awk '{print $3}'`" + + +# 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 +# +leds boot system +# +if test -n "$1" +then + device="$bootdev_name" + UUID="$bootdev_uuid" + + shift + # proc is needed for UUID mount and module load + mount -t proc proc /proc + # load USB & SCSI storage modules (/proc required!) + echo "boot: loading modules required for disk boot" + loaddiskmods + # waiting for disk (FIXME) + sleep=6 + test "$sleep" -gt 0 && sleep "$sleep" + # + # 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 + # 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 +nslu2_feeback failure +exec /boot/flash diff --git a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash b/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash new file mode 100644 index 0000000000..394279c2af --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash @@ -0,0 +1,18 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: 10-Onboard-Flash +# Date: 20070218 (YMD) + +leds beep +. /etc/default/functions +leds boot system +test -x /sbin/init && exec /sbin/init +# fallback if /sbin/init has been deleted (bad!) +leds boot system panic +exec <>/dev/console >&0 2>&0 +test -x /sbin/sulogin && exec /sbin/sulogin +test -x /bin/sh && exec /bin/sh +exit 1 diff --git a/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/nslu2le/altboot-menu/00-Default b/packages/altboot/files/nslu2le/altboot-menu/00-Default new file mode 100644 index 0000000000..cb06661d72 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-menu/00-Default @@ -0,0 +1,17 @@ +# !/bin/sh +M_TITLE="Flash" + + +run_module() { + leds beep + leds boot system + exec $REAL_INIT "$INIT_RUNLEVEL" + exit 0 +} + +case "$1" in +title) echo "$M_TITLE";; +run) run_module;; +*) echo "Unknown parameter [$1]";; +esac + diff --git a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick b/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick new file mode 100644 index 0000000000..c6c215ecc4 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick @@ -0,0 +1,174 @@ +# !/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="USB Attached 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 -e "\nStarting 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 "" + scan_devices + usb_show_menu + +# 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 +} + +scan_devices() { + reset_pref "available_devices" + + cnt=1 + + for scsi_disk in `ls -1 /sys/block/ | grep ^sd` + do + scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" + test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" + test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" + + test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" + test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" + + scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" + test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" + + set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" + set_pref "available_devices_short" "$cnt" "$scsi_disk" + set_pref "available_devices_type" "$cnt" "usb" + + let cnt=$cnt+1 + done + +} + +usb_show_menu() { + + cnt2=0 ; let cnt=$cnt-1 + while test "$cnt" != "$cnt2" + do + let cnt2=$cnt2+1 + get_pref "available_devices" "$cnt2" dev + + echo -e "\t[$cnt2] - $dev" + done + + while test -z "$selected_dev" + do + echo -en "\nYour choice: " + read junk + get_pref "available_devices" "$junk" selected_dev + get_pref "available_devices_type" "$junk" part_mode + +# debug_echo "show_menu(): selected: [$selected_dev]" + done + + if ( echo "$selected_dev" | grep -q "^Flash" ) + then + boot_from flash + else + get_pref "available_devices_short" "$junk" selected_dev +# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" + + partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" + test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" + + + echo -e "\nPlease select a partition on $selected_dev to boot from:\n" + + cnt=1 + for partition in $partitions + do + # We assume that partitions with a "size" < 10 are extended partitions + # and should not be listed. TYPE=swap is blacklisted as well. + part_size="`cat /sys/block/$selected_dev/$partition/size`" + part_type="`blkid -s TYPE -o value /dev/$partition`" + + if test "$part_size" -gt 10 -a "$part_type" != "swap" + then + let part_size="($part_size/2)/1000" + echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" + set_pref "available_partitions" "$cnt" "$partition" + + let cnt=$cnt+1 + fi + done + + while test -z "$selected_partition" + do + echo -en "\nYour choice: " + read junk + get_pref "available_partitions" "$junk" selected_partition + done + + part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" + + boot_from "$part_mode" "$selected_partition" "$part_uuid" + fi +} + +boot_from() { + debug_echo "boot_from() [$*]" + + part_mode="$1" + part_name="$2" + part_uuid="$3" + + case "$part_mode" in + usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 + rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev + + if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) + then + echo "** Note: UUID mount for $part_name failed" + mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" + fi + + if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit + then + copy_rootfs /tmp/mnt.set-bootdev/ + else + umount /tmp/mnt.set-bootdev + echo -e "\nSetting /dev/$part_name as boot-partition" + echo "3 $part_name $part_uuid" > /etc/altboot.last + fi + ;; + esac +} + +copy_rootfs() { + debug_echo "copy_rootfs() [$*]" +} + +case "$1" in +title) echo "$M_TITLE";; +run) run_module "$2";; +esac + diff --git a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh b/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh new file mode 100644 index 0000000000..1c3fccd9d9 --- /dev/null +++ b/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh @@ -0,0 +1,27 @@ +# !/bin/sh +M_TITLE="init=/bin/sh" + +test "$DISABLE_BINSH_BOOT" = yes && exit 0 + +run_module() { + + test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" + + test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >$OUT_TTY + + # Mount /proc, etc + init_rootfs + + echo -e "\nBoot system with 'exec /sbin/init 5'\n" + while true + do + exec $SH_SHELL <$OUT_TTY >$OUT_TTY 2>&1 + echo "WARNING: Shell was killed!" + done +} + +case "$1" in +title) echo "$M_TITLE";; +run) run_module;; +esac + diff --git a/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/set-bootdev b/packages/altboot/files/set-bootdev new file mode 100755 index 0000000000..60d0283dc4 --- /dev/null +++ b/packages/altboot/files/set-bootdev @@ -0,0 +1,150 @@ +#!/bin/sh + +VERSION="0.0.1" +ENABLE_DEBUG="yes" + +die() { + echo -e "ERROR: $1" + exit 1 +} + +. /etc/altboot.func || die "/etc/altboot.func is missing!" +test -d /sys/block || die "Sysfs problem? (/sys/block not found)" + +debug_echo() { + test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" +} + +scan_devices() { + reset_pref "available_devices" + + cnt=1 + set_pref "available_devices" "$cnt" "Flash" ; let cnt=$cnt+1 + + for scsi_disk in `ls -1 /sys/block/ | grep ^sd` + do + scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" + test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" + test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" + + test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" + test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" + + scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" + test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" + + set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" + set_pref "available_devices_short" "$cnt" "$scsi_disk" + set_pref "available_devices_type" "$cnt" "usb" + + let cnt=$cnt+1 + done + +} + +show_menu() { + echo -e "\nset-bootdev v$VERSION\n" + + echo -e "Please select the device you wish to boot from:\n" + + cnt2=0 ; let cnt=$cnt-1 + while test "$cnt" != "$cnt2" + do + let cnt2=$cnt2+1 + get_pref "available_devices" "$cnt2" dev + + echo -e "\t[$cnt2] - $dev" + done + + while test -z "$selected_dev" + do + echo -en "\nYour choice: " + read junk + get_pref "available_devices" "$junk" selected_dev + get_pref "available_devices_type" "$junk" part_mode + +# debug_echo "show_menu(): selected: [$selected_dev]" + done + + if ( echo "$selected_dev" | grep -q "^Flash" ) + then + boot_from flash + else + get_pref "available_devices_short" "$junk" selected_dev +# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" + + partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" + test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" + + + echo -e "\nPlease select a partition on $selected_dev to boot from:\n" + + cnt=1 + for partition in $partitions + do + # We assume that partitions with a "size" < 10 are extended partitions + # and should not be listed. TYPE=swap is blacklisted as well. + part_size="`cat /sys/block/$selected_dev/$partition/size`" + part_type="`blkid -s TYPE -o value /dev/$partition`" + + if test "$part_size" -gt 10 -a "$part_type" != "swap" + then + let part_size="($part_size/2)/1000" + echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" + set_pref "available_partitions" "$cnt" "$partition" + + let cnt=$cnt+1 + fi + done + + while test -z "$selected_partition" + do + echo -en "\nYour choice: " + read junk + get_pref "available_partitions" "$junk" selected_partition + done + + part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" + + boot_from "$part_mode" "$selected_partition" "$part_uuid" + fi +} + +boot_from() { + debug_echo "boot_from() [$*]" + + part_mode="$1" + part_name="$2" + part_uuid="$3" + + case "$part_mode" in + usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 + rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev + + if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) + then + echo "** Note: UUID mount for $part_name failed" + mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" + fi + + if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit + then + copy_rootfs /tmp/mnt.set-bootdev/ + else + umount /tmp/mnt.set-bootdev + echo -e "\nSetting /dev/$part_name as boot-partition" + echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf + fi + ;; + flash) echo "Setting the onboard flash as boot-partition" + echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf + ;; + esac +} + +copy_rootfs() { + debug_echo "copy_rootfs() [$*]" +} + +scan_devices +show_menu -- cgit v1.2.3 From efcbd9327aa0036799d20282b4639030203142f2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 27 Mar 2007 23:02:15 +0000 Subject: qte-mt, qte-mt-static 2.3.12: 2.3.12 is not fully tested version, lower DEF_PREF. * There were reports of build issues. --- packages/qte/qte-mt-static_2.3.12.bb | 2 ++ packages/qte/qte-mt_2.3.12.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb index c6e4f72667..9210d85dc3 100644 --- a/packages/qte/qte-mt-static_2.3.12.bb +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -1,6 +1,8 @@ require qte-common_${PV}.inc PR = "r4" +DEFAULT_PREFERENCE = "-1" + EXTRA_OECONF += "-static -thread" do_stage() { diff --git a/packages/qte/qte-mt_2.3.12.bb b/packages/qte/qte-mt_2.3.12.bb index 90e84fe38d..704081e639 100644 --- a/packages/qte/qte-mt_2.3.12.bb +++ b/packages/qte/qte-mt_2.3.12.bb @@ -1,6 +1,8 @@ require qte-common_${PV}.inc PR = "r2" +DEFAULT_PREFERENCE = "-1" + EXTRA_OECONF += "-thread" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 236ee589a8921c2f96c18f02d0ed3aeab38958b5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 27 Mar 2007 23:17:10 +0000 Subject: snes9x-sdl-qpe 1.39: Support both qte and qte-mt. * Closes #1975. --- packages/snes9x/snes9x-sdl-qpe_1.39.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb index 4e8a294d2b..adf49650d9 100644 --- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb +++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb @@ -3,7 +3,7 @@ SECTION = "opie/games" PRIORITY = "optional" DEPENDS = "libsdl-qpe" LICENSE = "snes9x" -PR = "r3" +PR = "r4" SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \ file://compile.patch;patch=1" @@ -13,10 +13,12 @@ FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE inherit qmake-base +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' + do_compile() { oe_runmake CC="${CC}" CCC="${CXX}" \ INCLUDES="-I${STAGING_INCDIR} `sdl-config --cflags`" \ - LDLIBS="`sdl-config --libs` -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -lqte" + LDLIBS="`sdl-config --libs` -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${STAGING_LIBDIR} -lqpe -l${QT_LIBRARY}" } do_install() { -- cgit v1.2.3 From bc6a7c3e28e23252895ad1a11cd957e0548b1476 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 08:22:53 +0000 Subject: openmoko-keyboard: add openmoko-keyboard recipe based on matchbox-keyboard, and add it to task-openmoko --- packages/openmoko-apps/openmoko-keyboard_svn.bb | 19 +++++++++++++++++++ packages/tasks/task-openmoko.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-apps/openmoko-keyboard_svn.bb diff --git a/packages/openmoko-apps/openmoko-keyboard_svn.bb b/packages/openmoko-apps/openmoko-keyboard_svn.bb new file mode 100644 index 0000000000..5bf5bbdd6a --- /dev/null +++ b/packages/openmoko-apps/openmoko-keyboard_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork" +LICENSE = "GPL" +DEPENDS = "libfakekey expat libxft" +SECTION = "openmoko/input-methods" +PV = "0.0+svn${SRCDATE}" + +inherit openmoko autotools pkgconfig gettext + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/applications;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + +EXTRA_OECONF = "--disable-cairo" + +FILES_${PN} = "${bindir}/* \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/openmoko-keyboard" + diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index dc4c7dcb0f..ece303d62a 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 = "r31" +PR = "r32" PACKAGES = "\ task-openmoko-linux \ @@ -141,6 +141,7 @@ DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications" RDEPENDS_task-openmoko-demo = "\ matchbox-desktop \ matchbox-keyboard \ + openmoko-keyboard \ matchbox-stroke \ matchbox-config-gtk \ matchbox-panel-2-applets \ -- cgit v1.2.3 From fa3f91a6bdc75a97b9e562bdee897a979a4417b2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:23:31 +0000 Subject: X11R7.2 preparation: xorg-apps - add individual release support to xorg-app-common.inc - add new X11R7.2 releases (individual release versions) they have smaller versions than anything where PV begins with "X11R7."... but the epoch is set PE="1". Thus the new packages will only be selected by either bitbake with epoch support or by a distro that sets PREFERRED_VERSIONs for X11R7.2. --- packages/xorg-app/appres_1.0.1.bb | 7 +++++++ packages/xorg-app/bdftopcf_1.0.1.bb | 7 +++++++ packages/xorg-app/beforelight_1.0.2.bb | 7 +++++++ packages/xorg-app/editres_1.0.2.bb | 7 +++++++ packages/xorg-app/fonttosfnt_1.0.3.bb | 7 +++++++ packages/xorg-app/luit_1.0.2.bb | 7 +++++++ packages/xorg-app/sessreg_1.0.2.bb | 7 +++++++ packages/xorg-app/setxkbmap_1.0.3.bb | 7 +++++++ packages/xorg-app/twm_1.0.3.bb | 11 +++++++++++ packages/xorg-app/xauth_1.0.2.bb | 7 +++++++ packages/xorg-app/xdbedizzy_1.0.2.bb | 7 +++++++ packages/xorg-app/xdm_1.1.3.bb | 8 ++++++++ packages/xorg-app/xf86dga_1.0.2.bb | 7 +++++++ packages/xorg-app/xfs_1.0.4.bb | 7 +++++++ packages/xorg-app/xinit_1.0.3.bb | 8 ++++++++ packages/xorg-app/xmodmap_1.0.2.bb | 8 ++++++++ packages/xorg-app/xorg-app-common.inc | 3 ++- packages/xorg-app/xprop_1.0.2.bb | 7 +++++++ 18 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-app/appres_1.0.1.bb create mode 100644 packages/xorg-app/bdftopcf_1.0.1.bb create mode 100644 packages/xorg-app/beforelight_1.0.2.bb create mode 100644 packages/xorg-app/editres_1.0.2.bb create mode 100644 packages/xorg-app/fonttosfnt_1.0.3.bb create mode 100644 packages/xorg-app/luit_1.0.2.bb create mode 100644 packages/xorg-app/sessreg_1.0.2.bb create mode 100644 packages/xorg-app/setxkbmap_1.0.3.bb create mode 100644 packages/xorg-app/twm_1.0.3.bb create mode 100644 packages/xorg-app/xauth_1.0.2.bb create mode 100644 packages/xorg-app/xdbedizzy_1.0.2.bb create mode 100644 packages/xorg-app/xdm_1.1.3.bb create mode 100644 packages/xorg-app/xf86dga_1.0.2.bb create mode 100644 packages/xorg-app/xfs_1.0.4.bb create mode 100644 packages/xorg-app/xinit_1.0.3.bb create mode 100644 packages/xorg-app/xmodmap_1.0.2.bb create mode 100644 packages/xorg-app/xprop_1.0.2.bb diff --git a/packages/xorg-app/appres_1.0.1.bb b/packages/xorg-app/appres_1.0.1.bb new file mode 100644 index 0000000000..4b6447a82e --- /dev/null +++ b/packages/xorg-app/appres_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "The appres program prints the resources seen by an application." + +DEPENDS += " virtual/libx11 libxt" + diff --git a/packages/xorg-app/bdftopcf_1.0.1.bb b/packages/xorg-app/bdftopcf_1.0.1.bb new file mode 100644 index 0000000000..c3e6ad2136 --- /dev/null +++ b/packages/xorg-app/bdftopcf_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." + +DEPENDS += " libxfont" + diff --git a/packages/xorg-app/beforelight_1.0.2.bb b/packages/xorg-app/beforelight_1.0.2.bb new file mode 100644 index 0000000000..a83c84eb79 --- /dev/null +++ b/packages/xorg-app/beforelight_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt" + diff --git a/packages/xorg-app/editres_1.0.2.bb b/packages/xorg-app/editres_1.0.2.bb new file mode 100644 index 0000000000..e5bf19bd71 --- /dev/null +++ b/packages/xorg-app/editres_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxt libxmu libxaw" + diff --git a/packages/xorg-app/fonttosfnt_1.0.3.bb b/packages/xorg-app/fonttosfnt_1.0.3.bb new file mode 100644 index 0000000000..8b7d7be108 --- /dev/null +++ b/packages/xorg-app/fonttosfnt_1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xproto freetype libfontenc" + diff --git a/packages/xorg-app/luit_1.0.2.bb b/packages/xorg-app/luit_1.0.2.bb new file mode 100644 index 0000000000..67fc3266ae --- /dev/null +++ b/packages/xorg-app/luit_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " zlib zlib virtual/libx11 libfontenc" + diff --git a/packages/xorg-app/sessreg_1.0.2.bb b/packages/xorg-app/sessreg_1.0.2.bb new file mode 100644 index 0000000000..dc281b41b0 --- /dev/null +++ b/packages/xorg-app/sessreg_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" + diff --git a/packages/xorg-app/setxkbmap_1.0.3.bb b/packages/xorg-app/setxkbmap_1.0.3.bb new file mode 100644 index 0000000000..9b97cf437a --- /dev/null +++ b/packages/xorg-app/setxkbmap_1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxkbfile virtual/libx11" + diff --git a/packages/xorg-app/twm_1.0.3.bb b/packages/xorg-app/twm_1.0.3.bb new file mode 100644 index 0000000000..b8e75b2bbd --- /dev/null +++ b/packages/xorg-app/twm_1.0.3.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "tiny window manager" + +DEPENDS += " virtual/libx11 libxext libxt libxmu" + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" diff --git a/packages/xorg-app/xauth_1.0.2.bb b/packages/xorg-app/xauth_1.0.2.bb new file mode 100644 index 0000000000..45aaafb1ce --- /dev/null +++ b/packages/xorg-app/xauth_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxau libxext libxmu" + diff --git a/packages/xorg-app/xdbedizzy_1.0.2.bb b/packages/xorg-app/xdbedizzy_1.0.2.bb new file mode 100644 index 0000000000..43d5a4bbb8 --- /dev/null +++ b/packages/xorg-app/xdbedizzy_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxp libxprintutil libxp libxau libxext" + diff --git a/packages/xorg-app/xdm_1.1.3.bb b/packages/xorg-app/xdm_1.1.3.bb new file mode 100644 index 0000000000..7b4195e3d8 --- /dev/null +++ b/packages/xorg-app/xdm_1.1.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X display manager" + +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" + +EXTRA_OECONF += " --with-random-device=/dev/urandom" diff --git a/packages/xorg-app/xf86dga_1.0.2.bb b/packages/xorg-app/xf86dga_1.0.2.bb new file mode 100644 index 0000000000..462797a68d --- /dev/null +++ b/packages/xorg-app/xf86dga_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu" + diff --git a/packages/xorg-app/xfs_1.0.4.bb b/packages/xorg-app/xfs_1.0.4.bb new file mode 100644 index 0000000000..b6db0f9b81 --- /dev/null +++ b/packages/xorg-app/xfs_1.0.4.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X fontserver" + +DEPENDS += " libfs libxfont xtrans" + diff --git a/packages/xorg-app/xinit_1.0.3.bb b/packages/xorg-app/xinit_1.0.3.bb new file mode 100644 index 0000000000..155bfc7c43 --- /dev/null +++ b/packages/xorg-app/xinit_1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" +FILES_${PN} += " /usr/lib/X11/xinit" + diff --git a/packages/xorg-app/xmodmap_1.0.2.bb b/packages/xorg-app/xmodmap_1.0.2.bb new file mode 100644 index 0000000000..b934ebfa48 --- /dev/null +++ b/packages/xorg-app/xmodmap_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +LICENSE = "MIT" + +DEPENDS += " virtual/libx11" + diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index b2a73f9ca8..15f76ab5e2 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/packages/xorg-app/xprop_1.0.2.bb b/packages/xorg-app/xprop_1.0.2.bb new file mode 100644 index 0000000000..8623021717 --- /dev/null +++ b/packages/xorg-app/xprop_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxmu virtual/libx11" + -- cgit v1.2.3 From 2ed8a4553687b1708ec50794360237761640f8e4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:29:34 +0000 Subject: X11R7.2 preparation: xorg-doc - add individual release support to xorg-doc-common.inc - add new X11R7.2 release (individual release version) of xorg-sgml-doctools --- packages/xorg-doc/xorg-doc-common.inc | 3 ++- packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc index de47e60df1..4c3d6e8987 100644 --- a/packages/xorg-doc/xorg-doc-common.inc +++ b/packages/xorg-doc/xorg-doc-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/doc/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb new file mode 100644 index 0000000000..18a3ef964a --- /dev/null +++ b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-doc-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +FILES_${PN} += " /usr/share/X11/sgml" -- cgit v1.2.3 From ee75ba0da96d14917b86a37af7d680baf23bbcbe Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:44:43 +0000 Subject: remove non-existant bdftopcf 1.0.1 --- packages/xorg-app/bdftopcf_1.0.1.bb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 packages/xorg-app/bdftopcf_1.0.1.bb diff --git a/packages/xorg-app/bdftopcf_1.0.1.bb b/packages/xorg-app/bdftopcf_1.0.1.bb deleted file mode 100644 index c3e6ad2136..0000000000 --- a/packages/xorg-app/bdftopcf_1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc -PE = "1" - -DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." - -DEPENDS += " libxfont" - -- cgit v1.2.3 From bab81fec328ef6838db19cc2795bddd561f51fef Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:05:48 +0000 Subject: X11R7.2 preparation: xorg-driver - add individual release support to xorg-driver-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-driver/xf86-input-keyboard_1.1.1.bb | 7 +++++++ packages/xorg-driver/xf86-input-mouse_1.1.2.bb | 7 +++++++ packages/xorg-driver/xf86-input-penmount_1.2.0.bb | 7 +++++++ packages/xorg-driver/xf86-video-ati_6.6.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-fbdev_0.3.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-i128_1.1.0.6.bb | 6 ++++++ packages/xorg-driver/xf86-video-i810_1.6.5.bb | 7 +++++++ packages/xorg-driver/xf86-video-newport_0.2.1.bb | 7 +++++++ packages/xorg-driver/xf86-video-nsc_2.8.2.bb | 7 +++++++ packages/xorg-driver/xf86-video-nv_1.2.2.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-rendition_4.1.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-s3_0.5.0.bb | 6 ++++++ packages/xorg-driver/xf86-video-savage_2.1.2.bb | 6 ++++++ packages/xorg-driver/xf86-video-sis_0.9.3.bb | 7 +++++++ packages/xorg-driver/xf86-video-tdfx_1.3.0.bb | 6 ++++++ packages/xorg-driver/xf86-video-trident_1.2.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-tseng_1.1.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-vesa_1.3.0.bb | 8 ++++++++ packages/xorg-driver/xf86-video-via_0.2.2.bb | 6 ++++++ packages/xorg-driver/xf86-video-vmware_10.14.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-voodoo_1.1.1.bb | 6 ++++++ packages/xorg-driver/xorg-driver-common.inc | 3 ++- 22 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-driver/xf86-input-keyboard_1.1.1.bb create mode 100644 packages/xorg-driver/xf86-input-mouse_1.1.2.bb create mode 100644 packages/xorg-driver/xf86-input-penmount_1.2.0.bb create mode 100644 packages/xorg-driver/xf86-video-ati_6.6.3.bb create mode 100644 packages/xorg-driver/xf86-video-fbdev_0.3.1.bb create mode 100644 packages/xorg-driver/xf86-video-i128_1.1.0.6.bb create mode 100644 packages/xorg-driver/xf86-video-i810_1.6.5.bb create mode 100644 packages/xorg-driver/xf86-video-newport_0.2.1.bb create mode 100644 packages/xorg-driver/xf86-video-nsc_2.8.2.bb create mode 100644 packages/xorg-driver/xf86-video-nv_1.2.2.1.bb create mode 100644 packages/xorg-driver/xf86-video-rendition_4.1.3.bb create mode 100644 packages/xorg-driver/xf86-video-s3_0.5.0.bb create mode 100644 packages/xorg-driver/xf86-video-savage_2.1.2.bb create mode 100644 packages/xorg-driver/xf86-video-sis_0.9.3.bb create mode 100644 packages/xorg-driver/xf86-video-tdfx_1.3.0.bb create mode 100644 packages/xorg-driver/xf86-video-trident_1.2.3.bb create mode 100644 packages/xorg-driver/xf86-video-tseng_1.1.1.bb create mode 100644 packages/xorg-driver/xf86-video-vesa_1.3.0.bb create mode 100644 packages/xorg-driver/xf86-video-via_0.2.2.bb create mode 100644 packages/xorg-driver/xf86-video-vmware_10.14.1.bb create mode 100644 packages/xorg-driver/xf86-video-voodoo_1.1.1.bb diff --git a/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb b/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb new file mode 100644 index 0000000000..b4ef6c683e --- /dev/null +++ b/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " kbproto" + diff --git a/packages/xorg-driver/xf86-input-mouse_1.1.2.bb b/packages/xorg-driver/xf86-input-mouse_1.1.2.bb new file mode 100644 index 0000000000..eb464ad5a6 --- /dev/null +++ b/packages/xorg-driver/xf86-input-mouse_1.1.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +DESCRIPTION = "Mouse Support in X11" + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-input-penmount_1.2.0.bb b/packages/xorg-driver/xf86-input-penmount_1.2.0.bb new file mode 100644 index 0000000000..f6032bceaa --- /dev/null +++ b/packages/xorg-driver/xf86-input-penmount_1.2.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-video-ati_6.6.3.bb b/packages/xorg-driver/xf86-video-ati_6.6.3.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-ati_6.6.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb b/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb b/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb new file mode 100644 index 0000000000..89cedc8b1a --- /dev/null +++ b/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "Number Nine I128 for X11" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i810_1.6.5.bb b/packages/xorg-driver/xf86-video-i810_1.6.5.bb new file mode 100644 index 0000000000..198985f247 --- /dev/null +++ b/packages/xorg-driver/xf86-video-i810_1.6.5.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "I810 for X11" + +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" + diff --git a/packages/xorg-driver/xf86-video-newport_0.2.1.bb b/packages/xorg-driver/xf86-video-newport_0.2.1.bb new file mode 100644 index 0000000000..b9f88fcc6f --- /dev/null +++ b/packages/xorg-driver/xf86-video-newport_0.2.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-video-nsc_2.8.2.bb b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb new file mode 100644 index 0000000000..9fc4277ad8 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xf86dgaproto" + diff --git a/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb b/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-rendition_4.1.3.bb b/packages/xorg-driver/xf86-video-rendition_4.1.3.bb new file mode 100644 index 0000000000..e6c89a8c74 --- /dev/null +++ b/packages/xorg-driver/xf86-video-rendition_4.1.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-s3_0.5.0.bb b/packages/xorg-driver/xf86-video-s3_0.5.0.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-s3_0.5.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-savage_2.1.2.bb b/packages/xorg-driver/xf86-video-savage_2.1.2.bb new file mode 100644 index 0000000000..999b319b23 --- /dev/null +++ b/packages/xorg-driver/xf86-video-savage_2.1.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-sis_0.9.3.bb b/packages/xorg-driver/xf86-video-sis_0.9.3.bb new file mode 100644 index 0000000000..ab53a64646 --- /dev/null +++ b/packages/xorg-driver/xf86-video-sis_0.9.3.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" + diff --git a/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb b/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb new file mode 100644 index 0000000000..999b319b23 --- /dev/null +++ b/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-trident_1.2.3.bb b/packages/xorg-driver/xf86-video-trident_1.2.3.bb new file mode 100644 index 0000000000..065e64dfb1 --- /dev/null +++ b/packages/xorg-driver/xf86-video-trident_1.2.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-tseng_1.1.1.bb b/packages/xorg-driver/xf86-video-tseng_1.1.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-tseng_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vesa_1.3.0.bb b/packages/xorg-driver/xf86-video-vesa_1.3.0.bb new file mode 100644 index 0000000000..1e6760c3dc --- /dev/null +++ b/packages/xorg-driver/xf86-video-vesa_1.3.0.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc +PE = "1" + +SRC_URI += "file://fix-includepath.patch;patch=1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-via_0.2.2.bb b/packages/xorg-driver/xf86-video-via_0.2.2.bb new file mode 100644 index 0000000000..a3ce7324c3 --- /dev/null +++ b/packages/xorg-driver/xf86-video-via_0.2.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto libxvmc" diff --git a/packages/xorg-driver/xf86-video-vmware_10.14.1.bb b/packages/xorg-driver/xf86-video-vmware_10.14.1.bb new file mode 100644 index 0000000000..c8169407cb --- /dev/null +++ b/packages/xorg-driver/xf86-video-vmware_10.14.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver for VMware SVGA Device" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb b/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb new file mode 100644 index 0000000000..bfceb2995c --- /dev/null +++ b/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver for Voodoo/Voodoo2" + +DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index ae85f602f0..8053e6c236 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -7,7 +7,8 @@ PR = "r1" DEPENDS = "randrproto xorg-server xproto" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/driver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -- cgit v1.2.3 From 90f4b2907d7755fb16f89d4184202b8278ff2cfd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:11:50 +0000 Subject: X11R7.2 preparation: xorg-font - add individual release support to xorg-font-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-font/encodings_1.0.2.bb | 8 ++++++++ packages/xorg-font/xorg-font-common.inc | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-font/encodings_1.0.2.bb diff --git a/packages/xorg-font/encodings_1.0.2.bb b/packages/xorg-font/encodings_1.0.2.bb new file mode 100644 index 0000000000..da67d037aa --- /dev/null +++ b/packages/xorg-font/encodings_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-font-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS = "mkfontscale-native" +RDEPENDS = "" + diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index 137ee0917f..148437a3e3 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -6,7 +6,8 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n RDEPENDS = "encodings font-util font-alias" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -- cgit v1.2.3 From 2fbac633f4f49ee742e8ff18a788ed6bb2031749 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:24:20 +0000 Subject: avahi: add scripts to start avahi-autoipd from udhcpc --- packages/avahi/avahi.inc | 28 ++++++++++++++++++++++++++-- packages/avahi/files/.mtn2git_empty | 0 packages/avahi/files/00avahi-autoipd | 10 ++++++++++ packages/avahi/files/99avahi-autoipd | 10 ++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 packages/avahi/files/.mtn2git_empty create mode 100755 packages/avahi/files/00avahi-autoipd create mode 100755 packages/avahi/files/99avahi-autoipd diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index 3a0b28cc53..fb71361a1d 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,12 +4,14 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" +PR="r1" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ + file://00avahi-autoipd file://99avahi-autoipd" inherit autotools pkgconfig update-rc.d @@ -35,7 +37,8 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_avahi-utils = "${bindir}/avahi-*" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ - ${sysconfdir}/avahi/avahi-autoipd.action" + ${sysconfdir}/avahi/avahi-autoipd.action \ + ${sysconfdir}/udhcpc.d/*avahi-autoipd" CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" @@ -62,11 +65,32 @@ pkg_postinst_avahi-daemon () { fi } +pkg_postinst_avahi-autoipd () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep avahi-autoipd /etc/group || addgroup avahi-autoipd + grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" +} + pkg_postrm_avahi-daemon () { deluser avahi || true delgroup avahi || true } +pkg_postrm_avahi-autoipd () { + deluser avahi-autoipd || true + delgroup avahi-autoipd || true +} + +do_install() { + autotools_do_install + install -d ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d +} + do_stage() { autotools_stage_all } diff --git a/packages/avahi/files/.mtn2git_empty b/packages/avahi/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/avahi/files/00avahi-autoipd b/packages/avahi/files/00avahi-autoipd new file mode 100755 index 0000000000..a0ab814603 --- /dev/null +++ b/packages/avahi/files/00avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + deconfig|renew|bound) + /usr/sbin/avahi-autoipd -k $interface 2> /dev/null + ;; +esac diff --git a/packages/avahi/files/99avahi-autoipd b/packages/avahi/files/99avahi-autoipd new file mode 100755 index 0000000000..234cdaa3eb --- /dev/null +++ b/packages/avahi/files/99avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + leasefail) + /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null + ;; +esac -- cgit v1.2.3 From 779bdbe42f923c547512fd05bf0925c20f540ade Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:48:42 +0000 Subject: X11R7.2 preparation: xorg-lib - add individual release support to xorg-lib-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-lib/diet-x11_1.1.1.bb | 11 +++++++++++ packages/xorg-lib/libfontenc_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libsm_1.0.2.bb | 10 ++++++++++ packages/xorg-lib/libx11_1.1.1.bb | 24 ++++++++++++++++++++++++ packages/xorg-lib/libxau_1.0.3.bb | 11 +++++++++++ packages/xorg-lib/libxcomposite_0.3.1.bb | 12 ++++++++++++ packages/xorg-lib/libxcursor_1.1.8.bb | 11 +++++++++++ packages/xorg-lib/libxdamage_1.0.4.bb | 11 +++++++++++ packages/xorg-lib/libxdmcp-native_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxdmcp_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxevie_1.0.2.bb | 9 +++++++++ packages/xorg-lib/libxext_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxfixes_4.0.3.bb | 10 ++++++++++ packages/xorg-lib/libxfont_1.2.7.bb | 14 ++++++++++++++ packages/xorg-lib/libxfontcache_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libxi_1.0.2.bb | 9 +++++++++ packages/xorg-lib/libxkbfile_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libxmu_1.0.3.bb | 17 +++++++++++++++++ packages/xorg-lib/libxpm_3.5.6.bb | 14 ++++++++++++++ packages/xorg-lib/libxrandr_1.1.2.bb | 10 ++++++++++ packages/xorg-lib/libxrender_0.9.2.bb | 10 ++++++++++ packages/xorg-lib/libxres_1.0.3.bb | 9 +++++++++ packages/xorg-lib/libxscrnsaver_1.1.2.bb | 14 ++++++++++++++ packages/xorg-lib/libxt_1.0.4.bb | 20 ++++++++++++++++++++ packages/xorg-lib/libxvmc_1.0.4.bb | 9 +++++++++ packages/xorg-lib/xorg-lib-common.inc | 3 ++- packages/xorg-lib/xtrans_1.0.3.bb | 9 +++++++++ 27 files changed, 306 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-lib/diet-x11_1.1.1.bb create mode 100644 packages/xorg-lib/libfontenc_1.0.4.bb create mode 100644 packages/xorg-lib/libsm_1.0.2.bb create mode 100644 packages/xorg-lib/libx11_1.1.1.bb create mode 100644 packages/xorg-lib/libxau_1.0.3.bb create mode 100644 packages/xorg-lib/libxcomposite_0.3.1.bb create mode 100644 packages/xorg-lib/libxcursor_1.1.8.bb create mode 100644 packages/xorg-lib/libxdamage_1.0.4.bb create mode 100644 packages/xorg-lib/libxdmcp-native_1.0.2.bb create mode 100644 packages/xorg-lib/libxdmcp_1.0.2.bb create mode 100644 packages/xorg-lib/libxevie_1.0.2.bb create mode 100644 packages/xorg-lib/libxext_1.0.2.bb create mode 100644 packages/xorg-lib/libxfixes_4.0.3.bb create mode 100644 packages/xorg-lib/libxfont_1.2.7.bb create mode 100644 packages/xorg-lib/libxfontcache_1.0.4.bb create mode 100644 packages/xorg-lib/libxi_1.0.2.bb create mode 100644 packages/xorg-lib/libxkbfile_1.0.4.bb create mode 100644 packages/xorg-lib/libxmu_1.0.3.bb create mode 100644 packages/xorg-lib/libxpm_3.5.6.bb create mode 100644 packages/xorg-lib/libxrandr_1.1.2.bb create mode 100644 packages/xorg-lib/libxrender_0.9.2.bb create mode 100644 packages/xorg-lib/libxres_1.0.3.bb create mode 100644 packages/xorg-lib/libxscrnsaver_1.1.2.bb create mode 100644 packages/xorg-lib/libxt_1.0.4.bb create mode 100644 packages/xorg-lib/libxvmc_1.0.4.bb create mode 100644 packages/xorg-lib/xtrans_1.0.3.bb diff --git a/packages/xorg-lib/diet-x11_1.1.1.bb b/packages/xorg-lib/diet-x11_1.1.1.bb new file mode 100644 index 0000000000..8dc3174a16 --- /dev/null +++ b/packages/xorg-lib/diet-x11_1.1.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/base" +require libx11_${PV}.bb + +EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1 \ + file://xchar2b.patch;patch=1" diff --git a/packages/xorg-lib/libfontenc_1.0.4.bb b/packages/xorg-lib/libfontenc_1.0.4.bb new file mode 100644 index 0000000000..afb7ffe10e --- /dev/null +++ b/packages/xorg-lib/libfontenc_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X fontenc library (used by libxfont)." +LICENSE = "BSD-X" +PRIORITY = "optional" + +DEPENDS += " zlib xproto" + diff --git a/packages/xorg-lib/libsm_1.0.2.bb b/packages/xorg-lib/libsm_1.0.2.bb new file mode 100644 index 0000000000..e5113dfc76 --- /dev/null +++ b/packages/xorg-lib/libsm_1.0.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "Session management library" +PRIORITY = "optional" + +DEPENDS += " libice xproto xtrans" + +XORG_PN = "libSM" + diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb new file mode 100644 index 0000000000..de47042dc4 --- /dev/null +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -0,0 +1,24 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "Base X libs." +SRC_URI += "file://makekeys.diff;patch=1" + +DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" + +XORG_PN = "libX11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + ) || exit 1 + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libxau_1.0.3.bb b/packages/xorg-lib/libxau_1.0.3.bb new file mode 100644 index 0000000000..dcde9b4da2 --- /dev/null +++ b/packages/xorg-lib/libxau_1.0.3.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "A Sample Authorization Protocol for X" +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xau" + +XORG_PN = "libXau" + diff --git a/packages/xorg-lib/libxcomposite_0.3.1.bb b/packages/xorg-lib/libxcomposite_0.3.1.bb new file mode 100644 index 0000000000..71842d4a4d --- /dev/null +++ b/packages/xorg-lib/libxcomposite_0.3.1.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Composite extension library." +LICENSE= "BSD-X" + +DEPENDS += " compositeproto virtual/libx11 libxfixes" +PROVIDES = "xcomposite" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcursor_1.1.8.bb b/packages/xorg-lib/libxcursor_1.1.8.bb new file mode 100644 index 0000000000..bf795757f6 --- /dev/null +++ b/packages/xorg-lib/libxcursor_1.1.8.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Cursor library" +LICENSE= "BSD-X" + +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" + +XORG_PN = "libXcursor" + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxdamage_1.0.4.bb b/packages/xorg-lib/libxdamage_1.0.4.bb new file mode 100644 index 0000000000..dd6fc42df6 --- /dev/null +++ b/packages/xorg-lib/libxdamage_1.0.4.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Damage extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" +PROVIDES = "xdamage" + +XORG_PN = "libXdamage" + diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb new file mode 100644 index 0000000000..2438a7b599 --- /dev/null +++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "BSD-X" +PE = "1" + +DEPENDS = "xproto-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2" +S = "${WORKDIR}/libXdmcp-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxdmcp_1.0.2.bb b/packages/xorg-lib/libxdmcp_1.0.2.bb new file mode 100644 index 0000000000..109c5b5615 --- /dev/null +++ b/packages/xorg-lib/libxdmcp_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Display Manager Control Protocol library." +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xdmcp" + +XORG_PN = "libXdmcp" + diff --git a/packages/xorg-lib/libxevie_1.0.2.bb b/packages/xorg-lib/libxevie_1.0.2.bb new file mode 100644 index 0000000000..06985bd112 --- /dev/null +++ b/packages/xorg-lib/libxevie_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" + +XORG_PN = "libXevie" + diff --git a/packages/xorg-lib/libxext_1.0.2.bb b/packages/xorg-lib/libxext_1.0.2.bb new file mode 100644 index 0000000000..a64067e2ad --- /dev/null +++ b/packages/xorg-lib/libxext_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Server Extension library" +PRIORITY = "optional" + +DEPENDS += " xproto virtual/libx11 xextproto libxau" +PROVIDES = "xext" + +XORG_PN = "libXext" + diff --git a/packages/xorg-lib/libxfixes_4.0.3.bb b/packages/xorg-lib/libxfixes_4.0.3.bb new file mode 100644 index 0000000000..cffe56a03a --- /dev/null +++ b/packages/xorg-lib/libxfixes_4.0.3.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Fixes extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" + +XORG_PN = "libXfixes" + diff --git a/packages/xorg-lib/libxfont_1.2.7.bb b/packages/xorg-lib/libxfont_1.2.7.bb new file mode 100644 index 0000000000..cc855c0106 --- /dev/null +++ b/packages/xorg-lib/libxfont_1.2.7.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X font library (used by the X server)." +LICENSE= "BSD-X" +PRIORITY = "optional" + +SRC_URI += "file://no-scalable-crash.patch;patch=1" + +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + diff --git a/packages/xorg-lib/libxfontcache_1.0.4.bb b/packages/xorg-lib/libxfontcache_1.0.4.bb new file mode 100644 index 0000000000..1e45867950 --- /dev/null +++ b/packages/xorg-lib/libxfontcache_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" + +XORG_PN = "libXfontcache" + diff --git a/packages/xorg-lib/libxi_1.0.2.bb b/packages/xorg-lib/libxi_1.0.2.bb new file mode 100644 index 0000000000..84c67f5ae3 --- /dev/null +++ b/packages/xorg-lib/libxi_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Input extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" + +XORG_PN = "libXi" + diff --git a/packages/xorg-lib/libxkbfile_1.0.4.bb b/packages/xorg-lib/libxkbfile_1.0.4.bb new file mode 100644 index 0000000000..2d9b778d02 --- /dev/null +++ b/packages/xorg-lib/libxkbfile_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X11 keyboard library" +LICENSE= "GPL" +PRIORITY = "optional" + +DEPENDS += " virtual/libx11 kbproto" + diff --git a/packages/xorg-lib/libxmu_1.0.3.bb b/packages/xorg-lib/libxmu_1.0.3.bb new file mode 100644 index 0000000000..e055874b3d --- /dev/null +++ b/packages/xorg-lib/libxmu_1.0.3.bb @@ -0,0 +1,17 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Window System miscellaneous utility library" +PRIORITY = "optional" + +DEPENDS += " libxt libxext xextproto virtual/libx11" +PROVIDES = "xmu" + +XORG_PN = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb new file mode 100644 index 0000000000..60779da43f --- /dev/null +++ b/packages/xorg-lib/libxpm_3.5.6.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Pixmap library." +PRIORITY = "optional" +LICENSE = "X-BSD" + +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxrandr_1.1.2.bb b/packages/xorg-lib/libxrandr_1.1.2.bb new file mode 100644 index 0000000000..18e5deffb8 --- /dev/null +++ b/packages/xorg-lib/libxrandr_1.1.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Resize and Rotate extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" + +XORG_PN = "libXrandr" + diff --git a/packages/xorg-lib/libxrender_0.9.2.bb b/packages/xorg-lib/libxrender_0.9.2.bb new file mode 100644 index 0000000000..b1372d3dac --- /dev/null +++ b/packages/xorg-lib/libxrender_0.9.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Render extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 renderproto" + +XORG_PN = "libXrender" + diff --git a/packages/xorg-lib/libxres_1.0.3.bb b/packages/xorg-lib/libxres_1.0.3.bb new file mode 100644 index 0000000000..b9d2fd68ce --- /dev/null +++ b/packages/xorg-lib/libxres_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Resource usage library." + +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" + +XORG_PN = "libXres" + diff --git a/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/packages/xorg-lib/libxscrnsaver_1.1.2.bb new file mode 100644 index 0000000000..163ca199c1 --- /dev/null +++ b/packages/xorg-lib/libxscrnsaver_1.1.2.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X screen saver extension library." +LICENSE = "GPL" + +DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" + +XORG_PN = "libXScrnSaver" + +PROVIDES = "libxss" +RREPLACES = "libxss" + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" diff --git a/packages/xorg-lib/libxt_1.0.4.bb b/packages/xorg-lib/libxt_1.0.4.bb new file mode 100644 index 0000000000..e67590bdf1 --- /dev/null +++ b/packages/xorg-lib/libxt_1.0.4.bb @@ -0,0 +1,20 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Toolkit Intrinsics" +PRIORITY = "optional" + +DEPENDS += " libsm virtual/libx11 xproto kbproto" +PROVIDES = "xt" + +XORG_PN = "libXt" + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) || exit 1 + oe_runmake +} diff --git a/packages/xorg-lib/libxvmc_1.0.4.bb b/packages/xorg-lib/libxvmc_1.0.4.bb new file mode 100644 index 0000000000..54aaa895ff --- /dev/null +++ b/packages/xorg-lib/libxvmc_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Video Motion Compensation extension library." + +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" + +XORG_PN = "libXvMC" + diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index 0c6c1388d2..e1f783e352 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -4,7 +4,8 @@ LICENSE = "MIT-X" DEPENDS = "util-macros xorg-headers-native" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-lib/xtrans_1.0.3.bb b/packages/xorg-lib/xtrans_1.0.3.bb new file mode 100644 index 0000000000..e32509a5c4 --- /dev/null +++ b/packages/xorg-lib/xtrans_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + -- cgit v1.2.3 From 83d964336d4e28d1be067ca515ea643c588e6b2a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:54:20 +0000 Subject: X11R7.2 preparation: xorg-proto - add individual release support to xorg-proto-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-proto/glproto_1.4.8.bb | 6 ++++++ packages/xorg-proto/xorg-proto-common.inc | 3 ++- packages/xorg-proto/xproto_7.0.10.bb | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-proto/glproto_1.4.8.bb create mode 100644 packages/xorg-proto/xproto_7.0.10.bb diff --git a/packages/xorg-proto/glproto_1.4.8.bb b/packages/xorg-proto/glproto_1.4.8.bb new file mode 100644 index 0000000000..7a4888d489 --- /dev/null +++ b/packages/xorg-proto/glproto_1.4.8.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE="1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc index 017e8755a8..1dc4f12fc7 100644 --- a/packages/xorg-proto/xorg-proto-common.inc +++ b/packages/xorg-proto/xorg-proto-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/proto/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-proto/xproto_7.0.10.bb b/packages/xorg-proto/xproto_7.0.10.bb new file mode 100644 index 0000000000..3f598df1bb --- /dev/null +++ b/packages/xorg-proto/xproto_7.0.10.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From 9178b2e1c457061710f3ee95b98ba845cf09cdc1 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:06:48 +0000 Subject: X11R7.2 preparation: xorg-xserver - add individual release support to xorg-xserver-common.inc - add new xorg-server 1.2.0 release --- packages/xorg-xserver/xorg-xserver-common.inc | 3 +- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 130 ++++++++++++++++++++++++++ packages/xorg-xserver/xserver-xorg_1.2.0.bb | 10 ++ 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-xserver/xserver-kdrive_1.2.0.bb create mode 100644 packages/xorg-xserver/xserver-xorg_1.2.0.bb diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 3aa3aaf3c6..fcfec6d4f7 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -19,7 +19,8 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" RDEPENDS_${PN} = "rgb" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/xserver/${XORG_PN}-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${MESA_VER}.tar.bz2 \ file://xorg.conf" diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb new file mode 100644 index 0000000000..5789004fd1 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -0,0 +1,130 @@ +LICENSE = "MIT" +DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PE = "1" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-fbdev \ + xserver-kdrive-sdl \ + xserver-kdrive-fake \ + xserver-kdrive-xephyr \ + xserver-kdrive-epson \ + xserver-kdrive-w100 \ + xserver-kdrive-ati \ + xserver-kdrive-chips \ + xserver-kdrive-i810 \ + xserver-kdrive-mach64 \ + xserver-kdrive-mga \ + xserver-kdrive-neomagic \ + xserver-kdrive-nvidia \ + xserver-kdrive-pm2 \ + xserver-kdrive-r128 \ + xserver-kdrive-smi \ + xserver-kdrive-vesa \ + xserver-kdrive-via \ + " + +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" +DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" +DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" +DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" +DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" +DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" + +FILES_${PN} += "${libdir}/xserver/SecurityPolicy" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-chips = "${bindir}/Xchips" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" +FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" +FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" +FILES_xserver-kdrive-r128 = "${bindir}/Xr128" +FILES_xserver-kdrive-smi = "${bindir}/Xsmi" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" +RDEPENDS_xserver-kdrive-ati = "${PN}" +RDEPENDS_xserver-kdrive-chips = "${PN}" +RDEPENDS_xserver-kdrive-i810 = "${PN}" +RDEPENDS_xserver-kdrive-mach64 = "${PN}" +RDEPENDS_xserver-kdrive-mga = "${PN}" +RDEPENDS_xserver-kdrive-neomagic = "${PN}" +RDEPENDS_xserver-kdrive-nvidia = "${PN}" +RDEPENDS_xserver-kdrive-pm2 = "${PN}" +RDEPENDS_xserver-kdrive-r128 = "${PN}" +RDEPENDS_xserver-kdrive-smi = "${PN}" +RDEPENDS_xserver-kdrive-vesa = "${PN}" +RDEPENDS_xserver-kdrive-via = "${PN}" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://kmode-palm.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +S = "${WORKDIR}/xorg-server-${PV}" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx ${W100_OECONF} \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb new file mode 100644 index 0000000000..900c3266cb --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -0,0 +1,10 @@ +require xorg-xserver-common.inc +PE = "1" + +SRC_URI += "file://drmfix.patch;patch=1" + +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From 4ccd0fb768192afa674c52fc467b5dc25df069a0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:08:23 +0000 Subject: X11R7.2 preparation: add preferred-xorg-versions-X11R7.2.inc --- .../include/preferred-xorg-versions-X11R7.2.inc | 270 +++++++++++++++++++++ 1 file changed, 270 insertions(+) create mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.2.inc diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc new file mode 100644 index 0000000000..be6813369e --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -0,0 +1,270 @@ +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" + +PREFERRED_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_libxpm ?= "libxpm" +PREFERRED_PROVIDER_xpm ?= "libxpm" +PREFERRED_PROVIDER_libxt ?= "libxt" +PREFERRED_PROVIDER_libxaw ?= "libxaw" +PREFERRED_PROVIDER_libice ?= "libice" +PREFERRED_PROVIDER_libxrender ?= "libxrender" +PREFERRED_PROVIDER_libxcursor ?= "libxcursor" +PREFERRED_PROVIDER_xextensions ?= "xextensions" +PREFERRED_PROVIDER_xproto ?= "xproto" +PREFERRED_PROVIDER_x11 ?= "libx11" +PREFERRED_PROVIDER_libxv ?= "libxv" +PREFERRED_PROVIDER_xft ?= "libxft" +PREFERRED_PROVIDER_libxrandr ?= "libxrandr" +PREFERRED_PROVIDER_libxdamage ?= "libxdamage" +PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite" +PREFERRED_PROVIDER_libxfixes ?= "libxfixes" +PREFERRED_PROVIDER_libxinerama ?= "libxinerama" +PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm" +PREFERRED_PROVIDER_libxmu ?= "libxmu" +PREFERRED_PROVIDER_libsm ?= "libsm" +PREFERRED_PROVIDER_xrandr ?= "xrandr" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" + +PREFERRED_VERSION_task-xorg ?= "X11R7.2" + +# app +PREFERRED_VERSION_appres ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_beforelight ?= "1.0.2" +PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_editres ?= "1.0.2" +PREFERRED_VERSION_fontosfnt ?= "1.0.3" +PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_iceauth ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_ico ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_listres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_luit ?= "1.0.2" +PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontscale ?= "1.0.3" +PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_sessreg ?= "1.0.2" +PREFERRED_VERSION_setxkbmap ?= "1.0.3" +PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_twm ?= "1.0.3" +PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xauth ?= "1.0.2" +PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcalc ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.3" +PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xxf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfs ?= "1.0.4" +PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xgamma ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xinit ?= "1.0.3" +PREFERRED_VERSION_xkbcomp ?= "1.0.3" +PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xload ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsclients ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmag ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xmessage ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.2" +PREFERRED_VERSION_xmore ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xphelloworld ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xplsprinters ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xpr ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xprehashprinterlist ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xprop ?= "1.0.2" +PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrx ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xsetmode ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_xsetpointer ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_xsetroot ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xsm ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xstdcmap ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xvidtune ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xvinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwd ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1" + +#data +PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-1.0.1" + +# doc +PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.1.1" + +# driver +PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0" +PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elographics ?= "X11R7.0-1.0.0.5" +PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2" +PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.1.1" +PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.1.2" +PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0" +PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "6.6.3" +PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1" +PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" +PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" +PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2" +PREFERRED_VERSION_xf86-video-nv ?= "1.2.2.1" +PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" +PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "2.1.2" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2" +PREFERRED_VERSION_xf86-video-sis ?= "0.9.3" +PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0" +PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" +PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" +PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" + +# font +PREFERRED_VERSION_encodings ?= "1.0.2" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" + +# lib +PREFERRED_VERSION_diet-x11 ?= "1.1.1" +PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libsm ?= "1.0.2" +PREFERRED_VERSION_libx11 ?= "1.1.1" +PREFERRED_VERSION_libxau ?= "1.0.3" +PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite ?= "0.3.1" +PREFERRED_VERSION_libxcursor ?= "1.1.8" +PREFERRED_VERSION_libxdamage ?= "1.0.4" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.2" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.0.2" +PREFERRED_VERSION_libxfixes ?= "4.0.3" +PREFERRED_VERSION_libxfont ?= "1.2.7" +PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxi ?= "1.0.2" +PREFERRED_VERSION_libxinerama ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_libxkbfile ?= "1.0.4" +PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu ?= "1.0.3" +PREFERRED_VERSION_libxpm ?= "3.5.6" +PREFERRED_VERSION_libxrandr ?= "1.1.2" +PREFERRED_VERSION_libxrender ?= "0.9.2" +PREFERRED_VERSION_libxres ?= "1.0.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" +PREFERRED_VERSION_libxt ?= "1.0.4" +PREFERRED_VERSION_libxvmc ?= "1.0.4" +PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xtrans ?= "1.0.3" + +# proto +PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1" +PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0" +PREFERRED_VERSION_glproto ?= "1.4.8" +PREFERRED_VERSION_kbproto ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xproto-native ?= "7.0.10" +PREFERRED_VERSION_xproto ?= "7.0.10" + +# util +PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_util-macros ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" + +# xserver +PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_xserver-xorg ?= "1.2.0" + -- cgit v1.2.3 From 2969cc50e8e3ae6f457e2436633199b2e2e68740 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:48:11 +0000 Subject: xcb: update to xcb-proto/libxcb 0.9.3, xcb-util 0.2 --- packages/xcb/libxcb_0.9.93.bb | 46 ++++++++++++++++++++++++++++++++++++++++ packages/xcb/xcb-proto_0.9.93.bb | 19 +++++++++++++++++ packages/xcb/xcb-util_0.2.bb | 41 +++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 packages/xcb/libxcb_0.9.93.bb create mode 100644 packages/xcb/xcb-proto_0.9.93.bb create mode 100644 packages/xcb/xcb-util_0.2.bb diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb new file mode 100644 index 0000000000..26eea1d576 --- /dev/null +++ b/packages/xcb/libxcb_0.9.93.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +PARALLEL_MAKE = "" +DEPENDS = "xcb-proto libxau" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" + +PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ + libxcb-randr libxcb-record libxcb-render libxcb-res \ + libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ + libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ + libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc" + +FILES_${PN} = "${libdir}/libxcb.so.*" +#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" +FILES_libxcb-composite = "${libdir}/libxcb-composite.so*" +FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" +FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" +FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" +FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" +FILES_libxcb-record = "${libdir}/libxcb-record.so.*" +FILES_libxcb-render = "${libdir}/libxcb-render.so.*" +FILES_libxcb-res = "${libdir}/libxcb-res.so.*" +FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" +FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" +FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*" +FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*" +FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*" +FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*" +FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*" +FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" +FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" +FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" +FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" +FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-proto_0.9.93.bb b/packages/xcb/xcb-proto_0.9.93.bb new file mode 100644 index 0000000000..f7f4160d5b --- /dev/null +++ b/packages/xcb/xcb-proto_0.9.93.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" + +inherit autotools pkgconfig + +FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/xcb.xsd" + +do_stage() { + oe_runmake DESTDIR="${D}" install + mkdir -p ${STAGING_LIBDIR}/pkgconfig + install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig + mkdir -p ${STAGING_DATADIR}/xcb + install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb +} diff --git a/packages/xcb/xcb-util_0.2.bb b/packages/xcb/xcb-util_0.2.bb new file mode 100644 index 0000000000..b0efa9f669 --- /dev/null +++ b/packages/xcb/xcb-util_0.2.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-${PV}.tar.bz2" + +PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ + libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ + libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" +FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From bf303b546f3ed8d3050e4c21c14d03232f56463e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 11:20:05 +0000 Subject: libx11-1.1.1: depends on libxcb --- packages/xorg-lib/libx11_1.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index de47042dc4..88225a8eb7 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Base X libs." SRC_URI += "file://makekeys.diff;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" + libxcb libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" RPROVIDES = "virtual/libx11" -- cgit v1.2.3 From 93eb9085a1a551875e241eacf8127dce5aa0f426 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 11:23:48 +0000 Subject: xserver-kdrive-1.2.0: depends on libxkbfile --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 5789004fd1..4e7d438b3e 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxkbfile libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PE = "1" -- cgit v1.2.3 From 9b72859f629ba81ea1d07c955dfbef070a9f7011 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 12:04:06 +0000 Subject: xserver-kdrive: add initial -common.inc to be used by all xserver-kdrive versions --- packages/xorg-xserver/xserver-kdrive-common.inc | 129 ++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-common.inc diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc new file mode 100644 index 0000000000..47ed5d0267 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -0,0 +1,129 @@ +LICENSE = "MIT" +DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto videoproto xextproto xproto \ + libxau libxext libxdmcp libxfont libxrandr tslib virtual/libsdl virtual/libx11 xtrans" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-fbdev \ + xserver-kdrive-sdl \ + xserver-kdrive-fake \ + xserver-kdrive-xephyr \ + xserver-kdrive-epson \ + xserver-kdrive-w100 \ + xserver-kdrive-ati \ + xserver-kdrive-chips \ + xserver-kdrive-i810 \ + xserver-kdrive-mach64 \ + xserver-kdrive-mga \ + xserver-kdrive-neomagic \ + xserver-kdrive-nvidia \ + xserver-kdrive-pm2 \ + xserver-kdrive-r128 \ + xserver-kdrive-smi \ + xserver-kdrive-vesa \ + xserver-kdrive-via \ + " + +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" +DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" +DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" +DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" +DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" +DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" + +FILES_${PN} += "${libdir}/xserver/SecurityPolicy" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-chips = "${bindir}/Xchips" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" +FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" +FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" +FILES_xserver-kdrive-r128 = "${bindir}/Xr128" +FILES_xserver-kdrive-smi = "${bindir}/Xsmi" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" +RDEPENDS_xserver-kdrive-ati = "${PN}" +RDEPENDS_xserver-kdrive-chips = "${PN}" +RDEPENDS_xserver-kdrive-i810 = "${PN}" +RDEPENDS_xserver-kdrive-mach64 = "${PN}" +RDEPENDS_xserver-kdrive-mga = "${PN}" +RDEPENDS_xserver-kdrive-neomagic = "${PN}" +RDEPENDS_xserver-kdrive-nvidia = "${PN}" +RDEPENDS_xserver-kdrive-pm2 = "${PN}" +RDEPENDS_xserver-kdrive-r128 = "${PN}" +RDEPENDS_xserver-kdrive-smi = "${PN}" +RDEPENDS_xserver-kdrive-vesa = "${PN}" +RDEPENDS_xserver-kdrive-via = "${PN}" + +SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + ${KDRIVE_COMMON_PATCHES}" +KDRIVE_COMMON_PATCHES = " \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://kmode-palm.patch;patch=1 \ + " + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx ${W100_OECONF} \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 551a53a388f30bbdc39aa29cea9411b5fe1e0dcb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 13:16:37 +0000 Subject: randrproto: add 1.2.1 (>= 1.2 is needed for xserver-kdrive_git) --- packages/xorg-proto/randrproto_1.2.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/randrproto_1.2.1.bb diff --git a/packages/xorg-proto/randrproto_1.2.1.bb b/packages/xorg-proto/randrproto_1.2.1.bb new file mode 100644 index 0000000000..1116da8f93 --- /dev/null +++ b/packages/xorg-proto/randrproto_1.2.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "randrext" -- cgit v1.2.3 From 3d54ca9f03dca695922e65e59549857ccc002842 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 13:58:48 +0000 Subject: damageproto: add 1.1.0 (>= 1.1 needed by xserver-kdrive_git) --- packages/xorg-proto/damageproto_1.1.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/damageproto_1.1.0.bb diff --git a/packages/xorg-proto/damageproto_1.1.0.bb b/packages/xorg-proto/damageproto_1.1.0.bb new file mode 100644 index 0000000000..ae54c06a64 --- /dev/null +++ b/packages/xorg-proto/damageproto_1.1.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "damageext" -- cgit v1.2.3 From 69a046148be38774781d90fc22a339136917d4ee Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 14:00:20 +0000 Subject: inputproto: add 1.4.1 (>= 1.4 needed by xserver-kdrive_git) --- packages/xorg-proto/inputproto_1.4.1.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/xorg-proto/inputproto_1.4.1.bb diff --git a/packages/xorg-proto/inputproto_1.4.1.bb b/packages/xorg-proto/inputproto_1.4.1.bb new file mode 100644 index 0000000000..40af1d2115 --- /dev/null +++ b/packages/xorg-proto/inputproto_1.4.1.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" -- cgit v1.2.3 From 609c4163e5e3d3a51f353d7baa4ec39ad5cfdffc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 14:12:15 +0000 Subject: xserver-kdrive-common.inc: shuffle w100/imageon support a bit --- packages/xorg-xserver/xserver-kdrive-common.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 47ed5d0267..bc1ac64c81 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -9,7 +9,6 @@ PACKAGES =+ "xserver-kdrive-fbdev \ xserver-kdrive-fake \ xserver-kdrive-xephyr \ xserver-kdrive-epson \ - xserver-kdrive-w100 \ xserver-kdrive-ati \ xserver-kdrive-chips \ xserver-kdrive-i810 \ @@ -35,6 +34,7 @@ DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset" DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" @@ -56,6 +56,7 @@ FILES_xserver-kdrive-w100 = "${bindir}/Xw100" FILES_xserver-kdrive-ati = "${bindir}/Xati" FILES_xserver-kdrive-chips = "${bindir}/Xchips" FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-imageon = "${bindir}/Ximageon" FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" FILES_xserver-kdrive-mga = "${bindir}/Xmga" FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" @@ -97,7 +98,6 @@ KDRIVE_COMMON_PATCHES = " \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ file://enable-epson.patch;patch=1 \ - file://w100.patch;patch=1 \ file://enable-tslib.patch;patch=1 \ file://xcalibrate.patch;patch=1 \ file://kmode-palm.patch;patch=1 \ @@ -114,16 +114,13 @@ inherit autotools pkgconfig ARM_INSTRUCTION_SET = "arm" -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" - EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ + --disable-dmx ${W100_OECONF} ${IMAGEON_OECONF} \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From b2fb28dbc919753212298bd283c118d6f1aea086 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 14:53:17 +0000 Subject: xorg-app-common: add dep on util-macros --- packages/xorg-app/xorg-app-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index 15f76ab5e2..a33d107675 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/applications" LICENSE = "MIT-X" -#DEPENDS = "" +DEPENDS = "util-macros" XORG_PN = "${PN}" XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2" -- cgit v1.2.3 From 8cbb367f96dd5826c03d10a9ec8abadf0073f717 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 15:09:53 +0000 Subject: openmoko: add qvga theme and mark themes as arch agnostic --- .../openmoko-theme-standard-qvga_svn.bb | 25 ++++++++++++++++++++++ .../openmoko-base/openmoko-theme-standard_svn.bb | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb new file mode 100644 index 0000000000..0c19db77ac --- /dev/null +++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version" +SECTION = "openmoko/base" +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +inherit openmoko-base + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http" +S = "${WORKDIR}" + +dirs = "themes/openmoko-standard" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir}/themes/ + for i in ${dirs}; do + cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/ + done + + install -d ${D}${sysconfdir}/gtk-2.0 + echo 'include "${datadir}/themes/openmoko-standard-qvga/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc +} + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir} ${sysconfdir}" diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb index e7a6def235..6265526de6 100644 --- a/packages/openmoko-base/openmoko-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.0+svn${SRCDATE}" -PR = "r3" +PR = "r4" inherit openmoko-base @@ -21,4 +21,5 @@ do_install() { echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc } +PACKAGE_ARCH = "all" FILES_${PN} = "${datadir} ${sysconfdir}" -- cgit v1.2.3 From b1b331bce16c054ebf9c32935ac6c487a6149116 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:23:36 +0000 Subject: xserver-kdrive-common: the tslib is patch not needed anymore in 1.2, the other two have to be modified --- packages/xorg-xserver/xserver-kdrive-common.inc | 3 - .../xserver-kdrive/enable-epson-1.2.patch | 11 + .../xserver-kdrive/xcalibrate-1.2.patch | 356 +++++++++++++++++++++ 3 files changed, 367 insertions(+), 3 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index bc1ac64c81..3cb038648e 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -97,9 +97,6 @@ KDRIVE_COMMON_PATCHES = " \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1 \ file://kmode-palm.patch;patch=1 \ " diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch new file mode 100644 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch @@ -0,0 +1,11 @@ +Index: xorg-server-1.2.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 +@@ -1,5 +1,5 @@ + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch new file mode 100644 index 0000000000..1a1fc373d5 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch @@ -0,0 +1,356 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-28 17:00:33.000000000 +0200 +@@ -372,6 +372,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -663,6 +666,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-28 16:59:42.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-28 17:02:05.000000000 +0200 +@@ -647,6 +647,12 @@ + AC_DEFINE(XCSECURITY, 1, [Build Security extension]) + fi + ++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) ++if test "x$XCALIBRATE" = xyes; then ++ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" ++fi ++ + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) + if test "x$XEVIE" = xyes; then + AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) +@@ -1539,7 +1545,7 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" ++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) +Index: xorg-server-1.2.0/include/kdrive-config.h.in +=================================================================== +--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-01-23 06:39:17.000000000 +0100 ++++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-28 17:00:33.000000000 +0200 +@@ -25,4 +25,7 @@ + /* Verbose debugging output hilarity */ + #undef DEBUG + ++/* Enable XCalibrate extension */ ++#undef XCALIBRATE ++ + #endif /* _KDRIVE_CONFIG_H_ */ +Index: xorg-server-1.2.0/Xext/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/Xext/Makefile.am 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/Xext/Makefile.am 2007-03-28 17:00:33.000000000 +0200 +@@ -91,6 +91,11 @@ + # XCalibrare needs tslib + endif + ++XCALIBRATE_SRCS = xcalibrate.c ++if XCALIBRATE ++BUILTIN_SRCS += $(XCALIBRATE_SRCS) ++endif ++ + # X EVent Interception Extension: allows accessibility helpers & composite + # managers to intercept events from input devices and transform as needed + # before the clients see them. +@@ -169,6 +174,7 @@ + $(XCSECURITY_SRCS) \ + $(XCALIBRATE_SRCS) \ + $(XINERAMA_SRCS) \ ++ $(XCALIBRATE_SRCS) \ + $(XEVIE_SRCS) \ + $(XPRINT_SRCS) \ + $(APPGROUP_SRCS) \ +Index: xorg-server-1.2.0/Xext/xcalibrate.c +=================================================================== +--- xorg-server-1.2.0.orig/Xext/xcalibrate.c 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/Xext/xcalibrate.c 2007-03-28 17:00:33.000000000 +0200 +@@ -260,3 +260,265 @@ + + xcalibrate_client = 0; + } ++/* ++ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ ++ * ++ * Copyright © 2003 Philip Blundell ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Philip Blundell not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Philip Blundell makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_KDRIVE_CONFIG_H ++#include ++#endif ++ ++#define NEED_EVENTS ++#define NEED_REPLIES ++ ++#include ++#include ++#include "misc.h" ++#include "os.h" ++#include "dixstruct.h" ++#include "extnsionst.h" ++#include "swaprep.h" ++ ++#include ++#include ++ ++extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); ++extern void *tslib_raw_event_closure; ++ ++static CARD8 XCalibrateReqCode; ++int XCalibrateEventBase; ++int XCalibrateReqBase; ++int XCalibrateErrorBase; ++ ++static ClientPtr xcalibrate_client; ++ ++static void ++xcalibrate_event_hook (int x, int y, int pressure, void *closure) ++{ ++ ClientPtr pClient = (ClientPtr) closure; ++ xXCalibrateRawTouchscreenEvent ev; ++ ++ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen; ++ ev.sequenceNumber = pClient->sequence; ++ ev.x = x; ++ ev.y = y; ++ ev.pressure = pressure; ++ ++ if (!pClient->clientGone) ++ WriteEventsToClient (pClient, 1, (xEvent *) &ev); ++} ++ ++static int ++ProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ xXCalibrateQueryVersionReply rep; ++ CARD16 client_major, client_minor; /* not used */ ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ ++ client_major = stuff->majorVersion; ++ client_minor = stuff->minorVersion; ++ ++ fprintf(stderr, "%s(): called\n", __func__); ++ ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; ++ rep.majorVersion = XCALIBRATE_MAJOR_VERSION; ++ rep.minorVersion = XCALIBRATE_MINOR_VERSION; ++ if (client->swapped) { ++ int n; ++ swaps(&rep.sequenceNumber, n); ++ swapl(&rep.length, n); ++ swaps(&rep.majorVersion, n); ++ swaps(&rep.minorVersion, n); ++ } ++ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep); ++ return (client->noClientException); ++} ++ ++static int ++SProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ swaps(&stuff->majorVersion,n); ++ swaps(&stuff->minorVersion,n); ++ return ProcXCalibrateQueryVersion(client); ++} ++ ++static int ++ProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ xXCalibrateRawModeReply rep; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ memset (&rep, 0, sizeof (rep)); ++ rep.type = X_Reply; ++ rep.sequenceNumber = client->sequence; ++ ++ if (stuff->on) ++ { ++ if (xcalibrate_client == NULL) ++ { ++ /* Start calibrating. */ ++ xcalibrate_client = client; ++ tslib_raw_event_hook = xcalibrate_event_hook; ++ tslib_raw_event_closure = client; ++ rep.status = GrabSuccess; ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ else ++ { ++ if (xcalibrate_client == client) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ rep.status = GrabSuccess; ++ ++ /* Cycle input off and on to reload configuration. */ ++ KdDisableInput (); ++ KdEnableInput (); ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ ++ if (client->swapped) ++ { ++ int n; ++ ++ swaps (&rep.sequenceNumber, n); ++ swaps (&rep.status, n); ++ } ++ WriteToClient(client, sizeof (rep), (char *) &rep); ++ return (client->noClientException); ++} ++ ++ ++static int ++SProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ swaps(&stuff->on, n); ++ ++ return ProcXCalibrateSetRawMode(client); ++} ++ ++static void ++XCalibrateResetProc (ExtensionEntry *extEntry) ++{ ++} ++ ++static int ++ProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return ProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return ProcXCalibrateSetRawMode(client); ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static int ++SProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ int n; ++ ++ swaps(&stuff->length,n); ++ ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return SProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return SProcXCalibrateSetRawMode(client); ++ ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static void ++XCalibrateClientCallback (CallbackListPtr *list, ++ pointer closure, ++ pointer data) ++{ ++ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ++ ClientPtr pClient = clientinfo->client; ++ ++ if (clientinfo->setup == NULL ++ && xcalibrate_client != NULL ++ && xcalibrate_client == pClient) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ } ++} ++ ++void ++XCalibrateExtensionInit(void) ++{ ++ ExtensionEntry *extEntry; ++ ++ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0)) ++ return; ++ ++ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors, ++ ProcXCalibrateDispatch, SProcXCalibrateDispatch, ++ XCalibrateResetProc, StandardMinorOpcode); ++ ++ if (!extEntry) ++ return; ++ ++ XCalibrateReqCode = (unsigned char)extEntry->base; ++ XCalibrateEventBase = extEntry->eventBase; ++ XCalibrateErrorBase = extEntry->errorBase; ++ ++ xcalibrate_client = 0; ++} -- cgit v1.2.3 From a3c1863f7b18e552f43befc0e3231f7752991d1e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:30:27 +0000 Subject: xserver-kdrive: change X11R7.1-1.1.0 to use xserver-kdrive-common.inc --- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 131 ++------------------- 1 file changed, 11 insertions(+), 120 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index fafad38b1a..1aff9cdf79 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,130 +1,21 @@ -LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +require xserver-kdrive-common.inc -PR = "r9" +DEPENDS += "xcalibrateext" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev \ - xserver-kdrive-sdl \ - xserver-kdrive-fake \ - xserver-kdrive-xephyr \ - xserver-kdrive-epson \ - xserver-kdrive-w100 \ - xserver-kdrive-ati \ - xserver-kdrive-chips \ - xserver-kdrive-i810 \ - xserver-kdrive-mach64 \ - xserver-kdrive-mga \ - xserver-kdrive-neomagic \ - xserver-kdrive-nvidia \ - xserver-kdrive-pm2 \ - xserver-kdrive-r128 \ - xserver-kdrive-smi \ - xserver-kdrive-vesa \ - xserver-kdrive-via \ - " +PR = "r10" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" -DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" -DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" -DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" -DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" -DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" +PACKAGES =+ "xserver-kdrive-w100" -FILES_${PN} += "${libdir}/xserver/SecurityPolicy" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" -FILES_xserver-kdrive-w100 = "${bindir}/Xw100" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-chips = "${bindir}/Xchips" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" -FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" -FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" -FILES_xserver-kdrive-r128 = "${bindir}/Xr128" -FILES_xserver-kdrive-smi = "${bindir}/Xsmi" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" - -RDEPENDS_xserver-kdrive-fbdev = "${PN}" -RDEPENDS_xserver-kdrive-fake = "${PN}" -RDEPENDS_xserver-kdrive-xephyr = "${PN}" -RDEPENDS_xserver-kdrive-epson = "${PN}" -RDEPENDS_xserver-kdrive-sdl = "${PN}" -RDEPENDS_xserver-kdrive-w100 = "${PN}" -RDEPENDS_xserver-kdrive-ati = "${PN}" -RDEPENDS_xserver-kdrive-chips = "${PN}" -RDEPENDS_xserver-kdrive-i810 = "${PN}" -RDEPENDS_xserver-kdrive-mach64 = "${PN}" -RDEPENDS_xserver-kdrive-mga = "${PN}" -RDEPENDS_xserver-kdrive-neomagic = "${PN}" -RDEPENDS_xserver-kdrive-nvidia = "${PN}" -RDEPENDS_xserver-kdrive-pm2 = "${PN}" -RDEPENDS_xserver-kdrive-r128 = "${PN}" -RDEPENDS_xserver-kdrive-smi = "${PN}" -RDEPENDS_xserver-kdrive-vesa = "${PN}" -RDEPENDS_xserver-kdrive-via = "${PN}" - -SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \ + ${KDRIVE_COMMON_PATCHES} \ file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ file://xcalibrate.patch;patch=1 \ - file://kmode-palm.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" -PACKAGE_ARCH_palmtx = "palmtx" -PACKAGE_ARCH_palmld = "palmld" -PACKAGE_ARCH_palmz72 = "palmz72" - -S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" - -inherit autotools pkgconfig + file://enable-epson.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://w100.patch;patch=1 \ + " -ARM_INSTRUCTION_SET = "arm" +S = "${WORKDIR}/xorg-server-${PV}" W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 285e3fcf035e239f072df60c5c323a20e21cd07a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:31:28 +0000 Subject: xserver-kdrive: change 1.2.0 to use xserver-kdrive-common.inc --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 136 +++----------------------- 1 file changed, 14 insertions(+), 122 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 4e7d438b3e..67e132d543 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -1,130 +1,22 @@ -LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxkbfile libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +require xserver-kdrive-common.inc -PE = "1" - -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev \ - xserver-kdrive-sdl \ - xserver-kdrive-fake \ - xserver-kdrive-xephyr \ - xserver-kdrive-epson \ - xserver-kdrive-w100 \ - xserver-kdrive-ati \ - xserver-kdrive-chips \ - xserver-kdrive-i810 \ - xserver-kdrive-mach64 \ - xserver-kdrive-mga \ - xserver-kdrive-neomagic \ - xserver-kdrive-nvidia \ - xserver-kdrive-pm2 \ - xserver-kdrive-r128 \ - xserver-kdrive-smi \ - xserver-kdrive-vesa \ - xserver-kdrive-via \ - " - -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" -DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" -DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" -DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" -DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" -DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" +DEPENDS += "libxkbfile libxcalibrate" -FILES_${PN} += "${libdir}/xserver/SecurityPolicy" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" -FILES_xserver-kdrive-w100 = "${bindir}/Xw100" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-chips = "${bindir}/Xchips" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" -FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" -FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" -FILES_xserver-kdrive-r128 = "${bindir}/Xr128" -FILES_xserver-kdrive-smi = "${bindir}/Xsmi" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" +PE = "1" +PR = "r1" -RDEPENDS_xserver-kdrive-fbdev = "${PN}" -RDEPENDS_xserver-kdrive-fake = "${PN}" -RDEPENDS_xserver-kdrive-xephyr = "${PN}" -RDEPENDS_xserver-kdrive-epson = "${PN}" -RDEPENDS_xserver-kdrive-sdl = "${PN}" -RDEPENDS_xserver-kdrive-w100 = "${PN}" -RDEPENDS_xserver-kdrive-ati = "${PN}" -RDEPENDS_xserver-kdrive-chips = "${PN}" -RDEPENDS_xserver-kdrive-i810 = "${PN}" -RDEPENDS_xserver-kdrive-mach64 = "${PN}" -RDEPENDS_xserver-kdrive-mga = "${PN}" -RDEPENDS_xserver-kdrive-neomagic = "${PN}" -RDEPENDS_xserver-kdrive-nvidia = "${PN}" -RDEPENDS_xserver-kdrive-pm2 = "${PN}" -RDEPENDS_xserver-kdrive-r128 = "${PN}" -RDEPENDS_xserver-kdrive-smi = "${PN}" -RDEPENDS_xserver-kdrive-vesa = "${PN}" -RDEPENDS_xserver-kdrive-via = "${PN}" +PACKAGES =+ "xserver-kdrive-imageon" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1 \ - file://kmode-palm.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" -PACKAGE_ARCH_palmtx = "palmtx" -PACKAGE_ARCH_palmld = "palmld" -PACKAGE_ARCH_palmz72 = "palmz72" + ${KDRIVE_COMMON_PATCHES} \ + file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ + file://xcalibrate-1.2.patch;patch=1 \ + file://enable-epson-1.2.patch;patch=1 \ + file://kdrive-vidmemarea.patch;patch=1 \ + file://kdrive-imageon.patch;patch=1 \ + " S = "${WORKDIR}/xorg-server-${PV}" -inherit autotools pkgconfig - -ARM_INSTRUCTION_SET = "arm" - -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" +IMAGEON_OECONF = "--disable-imageon" +IMAGEON_OECONF_arm = "--enable-imageon" -- cgit v1.2.3 From f4f68b661bf5ba29ee8f05a8d04bc9e24ee7c881 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:32:21 +0000 Subject: xserver-kdrive: change git version to use xserver-kdrive-common.inc --- .../disable-xf86-dga-xorgcfg-1.2.patch | 39 ++++++++++++ .../disable-xf86-dga-xorgcfg-git.patch | 39 ------------ packages/xorg-xserver/xserver-kdrive_git.bb | 70 +++------------------- 3 files changed, 48 insertions(+), 100 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch deleted file mode 100644 index 4b7e41e3e9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 -+++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 -@@ -513,7 +513,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test "$KDRIVE" = yes; then -+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" -+else - REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" -+fi - REQUIRED_LIBS="xfont xau fontenc" - - AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -@@ -1540,7 +1544,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x"$KDRIVE" = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -@@ -1560,10 +1566,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! "x$KDRIVE" = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 0fc9ec1997..6e53b40d05 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,71 +1,19 @@ -PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -PR = "r7" +require xserver-kdrive-common.inc -LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" +DEPENDS += "libxkbfile libxcalibrate" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" - -FILES_${PN} += "${libdir}/xserver/SecurityPolicy" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" -FILES_xserver-kdrive-w100 = "${bindir}/Xw100" - -RDEPENDS_xserver-kdrive-fbdev = "${PN}" -RDEPENDS_xserver-kdrive-fake = "${PN}" -RDEPENDS_xserver-kdrive-xephyr = "${PN}" -RDEPENDS_xserver-kdrive-epson = "${PN}" -RDEPENDS_xserver-kdrive-sdl = "${PN}" -RDEPENDS_xserver-kdrive-w100 = "${PN}" +PE = "1" +PV = "1.2.0+git${SRCDATE}" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ + ${KDRIVE_COMMON_PATCHES} \ + file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ + file://xcalibrate-1.2.patch;patch=1 \ file://enable-epson.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg-git.patch;patch=1 \ - file://w100.patch;patch=1 \ + file://build-fix-panoramix.patch;patch=1 \ " -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From b8637ac39ef2ffdb98926f4583c0b22a56b69fef Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 15:39:09 +0000 Subject: xserver-kdrive: remove xcalibrate-1.2 patch, xcalibrate is upstream after all --- .../xserver-kdrive/xcalibrate-1.2.patch | 356 --------------------- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 1 - packages/xorg-xserver/xserver-kdrive_git.bb | 1 - 3 files changed, 358 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch deleted file mode 100644 index 1a1fc373d5..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/xcalibrate-1.2.patch +++ /dev/null @@ -1,356 +0,0 @@ -Index: xorg-server-1.2.0/mi/miinitext.c -=================================================================== ---- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 -+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-28 17:00:33.000000000 +0200 -@@ -372,6 +372,9 @@ - #ifdef DMXEXT - extern void DMXExtensionInit(INITARGS); - #endif -+#ifdef XCALIBRATE -+extern void XCalibrateExtensionInit(INITARGS); -+#endif - #ifdef XEVIE - extern void XevieExtensionInit(INITARGS); - #endif -@@ -663,6 +666,9 @@ - #ifdef DAMAGE - if (!noDamageExtension) DamageExtensionInit(); - #endif -+#ifdef XCALIBRATE -+ XCalibrateExtensionInit (); -+#endif - } - - void -Index: xorg-server-1.2.0/configure.ac -=================================================================== ---- xorg-server-1.2.0.orig/configure.ac 2007-03-28 16:59:42.000000000 +0200 -+++ xorg-server-1.2.0/configure.ac 2007-03-28 17:02:05.000000000 +0200 -@@ -647,6 +647,12 @@ - AC_DEFINE(XCSECURITY, 1, [Build Security extension]) - fi - -+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) -+if test "x$XCALIBRATE" = xyes; then -+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" -+fi -+ - AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) - if test "x$XEVIE" = xyes; then - AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) -@@ -1539,7 +1545,7 @@ - ;; - esac - KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' -- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" -+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS" - - # check if we can build Xephyr - PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) -Index: xorg-server-1.2.0/include/kdrive-config.h.in -=================================================================== ---- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-01-23 06:39:17.000000000 +0100 -+++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-28 17:00:33.000000000 +0200 -@@ -25,4 +25,7 @@ - /* Verbose debugging output hilarity */ - #undef DEBUG - -+/* Enable XCalibrate extension */ -+#undef XCALIBRATE -+ - #endif /* _KDRIVE_CONFIG_H_ */ -Index: xorg-server-1.2.0/Xext/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/Xext/Makefile.am 2007-01-23 06:39:15.000000000 +0100 -+++ xorg-server-1.2.0/Xext/Makefile.am 2007-03-28 17:00:33.000000000 +0200 -@@ -91,6 +91,11 @@ - # XCalibrare needs tslib - endif - -+XCALIBRATE_SRCS = xcalibrate.c -+if XCALIBRATE -+BUILTIN_SRCS += $(XCALIBRATE_SRCS) -+endif -+ - # X EVent Interception Extension: allows accessibility helpers & composite - # managers to intercept events from input devices and transform as needed - # before the clients see them. -@@ -169,6 +174,7 @@ - $(XCSECURITY_SRCS) \ - $(XCALIBRATE_SRCS) \ - $(XINERAMA_SRCS) \ -+ $(XCALIBRATE_SRCS) \ - $(XEVIE_SRCS) \ - $(XPRINT_SRCS) \ - $(APPGROUP_SRCS) \ -Index: xorg-server-1.2.0/Xext/xcalibrate.c -=================================================================== ---- xorg-server-1.2.0.orig/Xext/xcalibrate.c 2007-01-23 06:39:15.000000000 +0100 -+++ xorg-server-1.2.0/Xext/xcalibrate.c 2007-03-28 17:00:33.000000000 +0200 -@@ -260,3 +260,265 @@ - - xcalibrate_client = 0; - } -+/* -+ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ -+ * -+ * Copyright © 2003 Philip Blundell -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Philip Blundell not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Philip Blundell makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#ifdef HAVE_KDRIVE_CONFIG_H -+#include -+#endif -+ -+#define NEED_EVENTS -+#define NEED_REPLIES -+ -+#include -+#include -+#include "misc.h" -+#include "os.h" -+#include "dixstruct.h" -+#include "extnsionst.h" -+#include "swaprep.h" -+ -+#include -+#include -+ -+extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); -+extern void *tslib_raw_event_closure; -+ -+static CARD8 XCalibrateReqCode; -+int XCalibrateEventBase; -+int XCalibrateReqBase; -+int XCalibrateErrorBase; -+ -+static ClientPtr xcalibrate_client; -+ -+static void -+xcalibrate_event_hook (int x, int y, int pressure, void *closure) -+{ -+ ClientPtr pClient = (ClientPtr) closure; -+ xXCalibrateRawTouchscreenEvent ev; -+ -+ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen; -+ ev.sequenceNumber = pClient->sequence; -+ ev.x = x; -+ ev.y = y; -+ ev.pressure = pressure; -+ -+ if (!pClient->clientGone) -+ WriteEventsToClient (pClient, 1, (xEvent *) &ev); -+} -+ -+static int -+ProcXCalibrateQueryVersion (ClientPtr client) -+{ -+ REQUEST(xXCalibrateQueryVersionReq); -+ xXCalibrateQueryVersionReply rep; -+ CARD16 client_major, client_minor; /* not used */ -+ -+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); -+ -+ client_major = stuff->majorVersion; -+ client_minor = stuff->minorVersion; -+ -+ fprintf(stderr, "%s(): called\n", __func__); -+ -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.majorVersion = XCALIBRATE_MAJOR_VERSION; -+ rep.minorVersion = XCALIBRATE_MINOR_VERSION; -+ if (client->swapped) { -+ int n; -+ swaps(&rep.sequenceNumber, n); -+ swapl(&rep.length, n); -+ swaps(&rep.majorVersion, n); -+ swaps(&rep.minorVersion, n); -+ } -+ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+static int -+SProcXCalibrateQueryVersion (ClientPtr client) -+{ -+ REQUEST(xXCalibrateQueryVersionReq); -+ int n; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); -+ swaps(&stuff->majorVersion,n); -+ swaps(&stuff->minorVersion,n); -+ return ProcXCalibrateQueryVersion(client); -+} -+ -+static int -+ProcXCalibrateSetRawMode (ClientPtr client) -+{ -+ REQUEST(xXCalibrateRawModeReq); -+ xXCalibrateRawModeReply rep; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); -+ -+ memset (&rep, 0, sizeof (rep)); -+ rep.type = X_Reply; -+ rep.sequenceNumber = client->sequence; -+ -+ if (stuff->on) -+ { -+ if (xcalibrate_client == NULL) -+ { -+ /* Start calibrating. */ -+ xcalibrate_client = client; -+ tslib_raw_event_hook = xcalibrate_event_hook; -+ tslib_raw_event_closure = client; -+ rep.status = GrabSuccess; -+ } -+ else -+ { -+ rep.status = AlreadyGrabbed; -+ } -+ } -+ else -+ { -+ if (xcalibrate_client == client) -+ { -+ /* Stop calibrating. */ -+ xcalibrate_client = NULL; -+ tslib_raw_event_hook = NULL; -+ tslib_raw_event_closure = NULL; -+ rep.status = GrabSuccess; -+ -+ /* Cycle input off and on to reload configuration. */ -+ KdDisableInput (); -+ KdEnableInput (); -+ } -+ else -+ { -+ rep.status = AlreadyGrabbed; -+ } -+ } -+ -+ if (client->swapped) -+ { -+ int n; -+ -+ swaps (&rep.sequenceNumber, n); -+ swaps (&rep.status, n); -+ } -+ WriteToClient(client, sizeof (rep), (char *) &rep); -+ return (client->noClientException); -+} -+ -+ -+static int -+SProcXCalibrateSetRawMode (ClientPtr client) -+{ -+ REQUEST(xXCalibrateRawModeReq); -+ int n; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); -+ -+ swaps(&stuff->on, n); -+ -+ return ProcXCalibrateSetRawMode(client); -+} -+ -+static void -+XCalibrateResetProc (ExtensionEntry *extEntry) -+{ -+} -+ -+static int -+ProcXCalibrateDispatch (ClientPtr client) -+{ -+ REQUEST(xReq); -+ switch (stuff->data) { -+ case X_XCalibrateQueryVersion: -+ return ProcXCalibrateQueryVersion(client); -+ case X_XCalibrateRawMode: -+ return ProcXCalibrateSetRawMode(client); -+ default: break; -+ } -+ -+ return BadRequest; -+} -+ -+static int -+SProcXCalibrateDispatch (ClientPtr client) -+{ -+ REQUEST(xReq); -+ int n; -+ -+ swaps(&stuff->length,n); -+ -+ switch (stuff->data) { -+ case X_XCalibrateQueryVersion: -+ return SProcXCalibrateQueryVersion(client); -+ case X_XCalibrateRawMode: -+ return SProcXCalibrateSetRawMode(client); -+ -+ default: break; -+ } -+ -+ return BadRequest; -+} -+ -+static void -+XCalibrateClientCallback (CallbackListPtr *list, -+ pointer closure, -+ pointer data) -+{ -+ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; -+ ClientPtr pClient = clientinfo->client; -+ -+ if (clientinfo->setup == NULL -+ && xcalibrate_client != NULL -+ && xcalibrate_client == pClient) -+ { -+ /* Stop calibrating. */ -+ xcalibrate_client = NULL; -+ tslib_raw_event_hook = NULL; -+ tslib_raw_event_closure = NULL; -+ } -+} -+ -+void -+XCalibrateExtensionInit(void) -+{ -+ ExtensionEntry *extEntry; -+ -+ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0)) -+ return; -+ -+ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors, -+ ProcXCalibrateDispatch, SProcXCalibrateDispatch, -+ XCalibrateResetProc, StandardMinorOpcode); -+ -+ if (!extEntry) -+ return; -+ -+ XCalibrateReqCode = (unsigned char)extEntry->base; -+ XCalibrateEventBase = extEntry->eventBase; -+ XCalibrateErrorBase = extEntry->errorBase; -+ -+ xcalibrate_client = 0; -+} diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 67e132d543..ac276a8e60 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -10,7 +10,6 @@ PACKAGES =+ "xserver-kdrive-imageon" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://xcalibrate-1.2.patch;patch=1 \ file://enable-epson-1.2.patch;patch=1 \ file://kdrive-vidmemarea.patch;patch=1 \ file://kdrive-imageon.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 6e53b40d05..74d0aed432 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -11,7 +11,6 @@ PR = "r8" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ ${KDRIVE_COMMON_PATCHES} \ file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://xcalibrate-1.2.patch;patch=1 \ file://enable-epson.patch;patch=1 \ file://build-fix-panoramix.patch;patch=1 \ " -- cgit v1.2.3 From c5c5c124b4ebd197faf32ab0c57738f14c6d604e Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 28 Mar 2007 17:36:41 +0000 Subject: openzaurus.inc: add PREFERRED_PROVIDER for qemu-native --- conf/distro/include/openzaurus.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index 4cdb68b4e3..4cf6fe1ead 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -21,3 +21,5 @@ INHERIT += "sanity" # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" + +PREFERRED_PROVIDER_qemu-native ?= "qemu-native" -- cgit v1.2.3 From 7e18fbe25e35f1801955ee150622761a07c8b8f1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 20:28:49 +0000 Subject: mediatomb: merge 0.9.0 recipe from mediatom svn --- packages/mediatomb/mediatomb_0.9.0.bb | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/mediatomb/mediatomb_0.9.0.bb diff --git a/packages/mediatomb/mediatomb_0.9.0.bb b/packages/mediatomb/mediatomb_0.9.0.bb new file mode 100644 index 0000000000..f3ea9f54dd --- /dev/null +++ b/packages/mediatomb/mediatomb_0.9.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux" +HOMEPAGE = "http://mediatomb.cc/" +LICENSE = "GPLv2" +DEPENDS = "sqlite3 libexif js zlib file id3lib" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-mysql \ + --disable-rpl-malloc \ + --enable-sqlite3 \ + --enable-libjs \ + --enable-libmagic \ + --enable-id3lib \ + --enable-libexif \ + --disable-largefile \ + --with-sqlite3-h=${STAGING_INCDIR} \ + --with-sqlite3-libs=${STAGING_LIBDIR} \ + --with-magic-h=${STAGING_INCDIR} \ + --with-magic-libs=${STAGING_LIBDIR} \ + --with-exif-h=${STAGING_INCDIR} \ + --with-exif-libs=${STAGING_LIBDIR} \ + --with-zlib-h=${STAGING_INCDIR} \ + --with-zlib-libs=${STAGING_LIBDIR} \ + --with-js-h=${STAGING_INCDIR}/js \ + --with-js-libs=${STAGING_LIBDIR} \ + --with-id3lib-h=${STAGING_INCDIR} \ + --with-id3lib-libs=${STAGING_LIBDIR}" -- cgit v1.2.3 From 2992d24c5ad56361a793281566b1ff7c76aa2836 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 28 Mar 2007 22:13:05 +0000 Subject: altboot: - Drop files/* and altboot_0.0.0.bb - Add altboot_svn.bb - Add README.txt explaining what the different versions do --- packages/altboot/README.txt | 5 + packages/altboot/altboot_0.0.0.bb | 99 --- packages/altboot/altboot_svn.bb | 95 +++ packages/altboot/files/.mtn2git_empty | 0 packages/altboot/files/akita/.mtn2git_empty | 0 packages/altboot/files/akita/altboot-2.4.cfg | 31 - packages/altboot/files/akita/altboot-2.6.cfg | 41 - packages/altboot/files/altboot-menu/.mtn2git_empty | 0 packages/altboot/files/altboot-menu/00-Default | 14 - packages/altboot/files/altboot-menu/10-noGui | 16 - packages/altboot/files/altboot-menu/15-bootSD | 32 - packages/altboot/files/altboot-menu/20-bootCF | 32 - .../files/altboot-menu/99-ownScripts-example | 68 -- .../files/altboot-menu/Advanced/.mtn2git_empty | 0 .../files/altboot-menu/Advanced/30-bootUSB-Stick | 47 -- .../altboot/files/altboot-menu/Advanced/40-bootNFS | 110 --- .../altboot/files/altboot-menu/Advanced/55-bin-sh | 27 - .../files/altboot-menu/Advanced/60-orig-init | 20 - .../files/altboot-menu/Advanced/70-install-tgz | 266 ------- .../files/altboot-menu/Advanced/70-setKernel | 68 -- .../files/altboot-menu/Advanced/80-configure-kexec | 248 ------ .../files/altboot-menu/Advanced/80-copyrootfs | 323 -------- packages/altboot/files/altboot.func | 870 --------------------- packages/altboot/files/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/altboot.rc/Readme.txt | 2 - .../altboot/files/altboot.rc/disable_printk.sh | 6 - packages/altboot/files/altboot.rc/loadkeymap.sh | 8 - packages/altboot/files/altboot.rc/playbeep.sh | 34 - packages/altboot/files/altbootctl | 311 -------- packages/altboot/files/altbootctl.conf | 98 --- packages/altboot/files/beep.raw | 1 - packages/altboot/files/c7x0/.mtn2git_empty | 0 packages/altboot/files/c7x0/altboot-2.4.cfg | 30 - packages/altboot/files/c7x0/altboot-2.6.cfg | 39 - packages/altboot/files/collie/.mtn2git_empty | 0 packages/altboot/files/collie/altboot-2.4.cfg | 26 - packages/altboot/files/fic-gta01/.mtn2git_empty | 0 packages/altboot/files/fic-gta01/altboot-2.6.cfg | 41 - .../files/fic-gta01/altboot-menu/.mtn2git_empty | 0 .../files/fic-gta01/altboot-menu/00-Default | 14 - .../altboot/files/fic-gta01/altboot-menu/15-bootSD | 32 - .../fic-gta01/altboot-menu/Advanced/.mtn2git_empty | 0 .../fic-gta01/altboot-menu/Advanced/40-bootNFS | 110 --- packages/altboot/files/init.altboot | 606 -------------- packages/altboot/files/nslu2le/.mtn2git_empty | 0 packages/altboot/files/nslu2le/altboot-2.6.cfg | 55 -- .../files/nslu2le/altboot-handlers/.mtn2git_empty | 0 .../files/nslu2le/altboot-handlers/05-USB-Storage | 90 --- .../nslu2le/altboot-handlers/10-Onboard-Flash | 18 - .../files/nslu2le/altboot-menu/.mtn2git_empty | 0 .../altboot/files/nslu2le/altboot-menu/00-Default | 17 - .../files/nslu2le/altboot-menu/30-bootUSB-Stick | 174 ----- .../altboot/files/nslu2le/altboot-menu/55-bin-sh | 27 - .../files/nslu2le/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/poodle/.mtn2git_empty | 0 packages/altboot/files/poodle/altboot-2.4.cfg | 26 - packages/altboot/files/poodle/altboot-2.6.cfg | 45 -- packages/altboot/files/set-bootdev | 150 ---- packages/altboot/files/spitz/.mtn2git_empty | 0 packages/altboot/files/spitz/altboot-2.6.cfg | 41 - packages/altboot/files/tosa/.mtn2git_empty | 0 packages/altboot/files/tosa/altboot-2.4.cfg | 32 - packages/altboot/files/tosa/altboot-2.6.cfg | 41 - 63 files changed, 100 insertions(+), 4386 deletions(-) create mode 100644 packages/altboot/README.txt delete mode 100644 packages/altboot/altboot_0.0.0.bb create mode 100644 packages/altboot/altboot_svn.bb delete mode 100644 packages/altboot/files/.mtn2git_empty delete mode 100644 packages/altboot/files/akita/.mtn2git_empty delete mode 100644 packages/altboot/files/akita/altboot-2.4.cfg delete mode 100644 packages/altboot/files/akita/altboot-2.6.cfg delete mode 100644 packages/altboot/files/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot-menu/00-Default delete mode 100644 packages/altboot/files/altboot-menu/10-noGui delete mode 100644 packages/altboot/files/altboot-menu/15-bootSD delete mode 100644 packages/altboot/files/altboot-menu/20-bootCF delete mode 100644 packages/altboot/files/altboot-menu/99-ownScripts-example delete mode 100644 packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick delete mode 100644 packages/altboot/files/altboot-menu/Advanced/40-bootNFS delete mode 100644 packages/altboot/files/altboot-menu/Advanced/55-bin-sh delete mode 100644 packages/altboot/files/altboot-menu/Advanced/60-orig-init delete mode 100644 packages/altboot/files/altboot-menu/Advanced/70-install-tgz delete mode 100644 packages/altboot/files/altboot-menu/Advanced/70-setKernel delete mode 100644 packages/altboot/files/altboot-menu/Advanced/80-configure-kexec delete mode 100644 packages/altboot/files/altboot-menu/Advanced/80-copyrootfs delete mode 100644 packages/altboot/files/altboot.func delete mode 100644 packages/altboot/files/altboot.rc/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot.rc/Readme.txt delete mode 100644 packages/altboot/files/altboot.rc/disable_printk.sh delete mode 100644 packages/altboot/files/altboot.rc/loadkeymap.sh delete mode 100644 packages/altboot/files/altboot.rc/playbeep.sh delete mode 100755 packages/altboot/files/altbootctl delete mode 100644 packages/altboot/files/altbootctl.conf delete mode 100644 packages/altboot/files/beep.raw delete mode 100644 packages/altboot/files/c7x0/.mtn2git_empty delete mode 100644 packages/altboot/files/c7x0/altboot-2.4.cfg delete mode 100644 packages/altboot/files/c7x0/altboot-2.6.cfg delete mode 100644 packages/altboot/files/collie/.mtn2git_empty delete mode 100644 packages/altboot/files/collie/altboot-2.4.cfg delete mode 100644 packages/altboot/files/fic-gta01/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-2.6.cfg delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/00-Default delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/15-bootSD delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS delete mode 100644 packages/altboot/files/init.altboot delete mode 100644 packages/altboot/files/nslu2le/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-2.6.cfg delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/00-Default delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/55-bin-sh delete mode 100644 packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty delete mode 100644 packages/altboot/files/poodle/.mtn2git_empty delete mode 100644 packages/altboot/files/poodle/altboot-2.4.cfg delete mode 100644 packages/altboot/files/poodle/altboot-2.6.cfg delete mode 100755 packages/altboot/files/set-bootdev delete mode 100644 packages/altboot/files/spitz/.mtn2git_empty delete mode 100644 packages/altboot/files/spitz/altboot-2.6.cfg delete mode 100644 packages/altboot/files/tosa/.mtn2git_empty delete mode 100644 packages/altboot/files/tosa/altboot-2.4.cfg delete mode 100644 packages/altboot/files/tosa/altboot-2.6.cfg diff --git a/packages/altboot/README.txt b/packages/altboot/README.txt new file mode 100644 index 0000000000..07a41bef3d --- /dev/null +++ b/packages/altboot/README.txt @@ -0,0 +1,5 @@ +altboot_1.0.5.bb - Last known-working version for clamshell + Zauruses running kernel 2.4 +altboot_1.0.8.bb - Last known-working version for all Zauruses +altboot_1.1.1+wip-20061123.bb - Last known-working version for neo1973 +altboot_wip.bb diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb deleted file mode 100644 index 930a30c1ac..0000000000 --- a/packages/altboot/altboot_0.0.0.bb +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_0.0.0.bb -# Date: 07-May-06 - -DESCRIPTION = "The altboot bootmanager" -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" -INHIBIT_PACKAGE_STRIP = "1" - -###################################################################################### - -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" - -# Currently the OM image for the Neo is lacking a few basic things... -RDEPENDS_${PN}_fic-gta01 = "${PN}-conf kernel-module-ext2 kernel-module-loop kernel-module-s3cmci " - - -###################################################################################### - -PR = "r52" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -#PACKAGE_ARCH_${PN} = "all" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "file://altboot-menu \ - file://altboot.rc \ - file://altboot.func \ - file://init.altboot \ - file://altboot*.cfg \ - file://altbootctl.conf \ - file://altbootctl \ - file://beep.raw" - -# S = "${WORKDIR}/altboot/" - -###################################################################################### - -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 -m 0644 ${WORKDIR}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc - install -m 0644 ${WORKDIR}/altboot.func ${D}/etc - install -m 0644 ${WORKDIR}/altbootctl.conf ${D}/etc - install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altbootctl ${D}/sbin - - install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu - - 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 -} - -###################################################################################### - -do_configure() { - cat ${WORKDIR}/init.altboot | sed "s/^VERSION=.*/VERSION=\"0.0.0 Developer Snapshot (${DATE})\"/" > ${WORKDIR}/init.altboot_ - mv ${WORKDIR}/init.altboot_ ${WORKDIR}/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 -} - diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb new file mode 100644 index 0000000000..baf5116d70 --- /dev/null +++ b/packages/altboot/altboot_svn.bb @@ -0,0 +1,95 @@ +#! /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}" + +###################################################################################### + +PV = "1.1.1+wip-${SRCDATE}" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +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 +} + diff --git a/packages/altboot/files/.mtn2git_empty b/packages/altboot/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/akita/.mtn2git_empty b/packages/altboot/files/akita/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/akita/altboot-2.4.cfg b/packages/altboot/files/akita/altboot-2.4.cfg deleted file mode 100644 index 4ea84ce32d..0000000000 --- a/packages/altboot/files/akita/altboot-2.4.cfg +++ /dev/null @@ -1,31 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg deleted file mode 100644 index 62e8ea2434..0000000000 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/altboot-menu/.mtn2git_empty b/packages/altboot/files/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot-menu/00-Default b/packages/altboot/files/altboot-menu/00-Default deleted file mode 100644 index 9d29fdae2a..0000000000 --- a/packages/altboot/files/altboot-menu/00-Default +++ /dev/null @@ -1,14 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - - -run_module() { - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/10-noGui b/packages/altboot/files/altboot-menu/10-noGui deleted file mode 100644 index cf3c10c381..0000000000 --- a/packages/altboot/files/altboot-menu/10-noGui +++ /dev/null @@ -1,16 +0,0 @@ -# !/bin/sh -M_TITLE="Don't launch GUI" - -test "$DISABLE_NOGUI_BOOT" = yes && exit 0 - - -run_module() { - clear ; exec $REAL_INIT "$NO_GUI_RL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD deleted file mode 100644 index 3cf49deea5..0000000000 --- a/packages/altboot/files/altboot-menu/15-bootSD +++ /dev/null @@ -1,32 +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 SD card" - -test "$DISABLE_SD_BOOT" = 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 - - mount_sd - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/20-bootCF b/packages/altboot/files/altboot-menu/20-bootCF deleted file mode 100644 index 4add6e6631..0000000000 --- a/packages/altboot/files/altboot-menu/20-bootCF +++ /dev/null @@ -1,32 +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 CF card" - -test "$DISABLE_CF_BOOT" = 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 - - mount_cf - - # Check for a real fs and loop-images. - check_target "$CF_MOUNTPOINT" - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/99-ownScripts-example b/packages/altboot/files/altboot-menu/99-ownScripts-example deleted file mode 100644 index 7566416b87..0000000000 --- a/packages/altboot/files/altboot-menu/99-ownScripts-example +++ /dev/null @@ -1,68 +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) - - -# This file will teach you how to implement your own scripts while using existing altboot -# code. - -# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which -# return a title when run with the "title" parameter. -# Script which do not return a title will never be shown in the boot menu! -# -M_TITLE="altboot sample" - -# We can use that to deactivate certain scripts: -exit 0 - -# The "title" parameter is implemented at the end of this script so it will never be reached -# and the script will simply be ignored by altboot. - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - # altboot.func contains re-useable code. If you intend to use check_target (see below) - # you must keep this line. If not, delete it. - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - - # The only thing you'll have to do is get your medium mounted. - # The following lines mount a SD card on 2.4-series kernels on a Zaurus - - ########################################## - - # Mount /proc, etc - init_rootfs - - echo -n "Loading SD kernel module..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - - echo -n "Mounting $SD_MOUNTPOINT..." >/dev/tty0 - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - ########################################## - - # Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere, - # just call check_target with the mountpoint as parameter. - # check_target searches the medium for a real filesystem and loop-images and - # asks the user what to boot if there are several choices. - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - - # Done :) - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick deleted file mode 100644 index b573e7a10c..0000000000 --- a/packages/altboot/files/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 - diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 4f5c195be2..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,110 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: 40-bootNFS -# Date: 14-Apr-06 - - -M_TITLE="Boot from NFS" - -test "$DISABLE_NFS_BOOT" = 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 - - nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - start_networking "$nfs_host" - - if test -z "$nfs_host" - then - mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" - - fi - - - if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 - then - echo -e "Please select your NFS root:\n" - - cnt=1 - for nfs_mount in $nfs_mountpoints - do - echo -e "\t[$cnt] $nfs_mount" - let cnt=$cnt+1 - done - - echo "" - - while test -z "$selection" - do - stty echo - echo -n "Boot NFS root: " - - if test "$AUTOBOOT" != "yes" - then - read junk < /dev/tty1 - else - if test -e /etc/.altboot-bootNFS-source.last - then - junk="`cat /etc/.altboot-bootNFS-source.last`" - test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" - else - read junk < /dev/tty1 - fi - fi - - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - echo "$junk" > /etc/.altboot-bootNFS-source.last - fi - let cnt=$cnt+1 - done - - done - else - test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!" - selection="$nfs_mounts" - fi - - mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - - if ( mount | grep -q "/media/nfsroot" ) - then - echo "/media/nfsroot already used, tying to umount..." - umount /media/image - losetup -d /dev/loop0 - umount /media/nfsroot || die "umount failed!" - fi - - mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!" - - # Use configured resolv.conf in the pivoted rootfs - #echo -n "Copying resolv.conf..." - #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - - check_target "/media/nfsroot" bootNFS - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh deleted file mode 100644 index e4fe99ebae..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh +++ /dev/null @@ -1,27 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - -test "$DISABLE_BINSH_BOOT" = yes && exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/$OUT_TTY - - # Mount /proc, etc - init_rootfs - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL /dev/$OUT_TTY 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/60-orig-init b/packages/altboot/files/altboot-menu/Advanced/60-orig-init deleted file mode 100644 index ad9f2c78e1..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/60-orig-init +++ /dev/null @@ -1,20 +0,0 @@ -# !/bin/sh -M_TITLE="Boot original INIT" - -exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo "altboot: Using real init [$REAL_INIT] [$INIT_RUNLEVEL] *" >/dev/tty1 - exec $REAL_INIT $INIT_RUNLEVEL - exit 0 - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz deleted file mode 100644 index b6e5d94d5d..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ /dev/null @@ -1,266 +0,0 @@ -#!/bin/sh -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!" - - # Mount /proc, etc - init_rootfs - - # Mount - mount_sd ingore_errors - mount_cf - mount_home - - for source in /home /media/card /media/cf - do - #echo "source: [$source]" - rootfs_files="`ls -1 $source | grep "rootfs.tar.gz"`" - - #echo "rootfs_file: [$rootfs_files]" - if test "`echo "$rootfs_files" | wc -l | tr -d " "`" -gt 1 - then - echo "Multiple rootfs files not supported, yet" - else - if test -n "$rootfs_files" - then - rootfs_source="$source/$rootfs_files" - echo "Using [$rootfs_source]" - break - fi - fi - done - - test -z "$rootfs_source" && die "No rootfs.tar.gz found" - - echo -e "\nPlease choose the target of this installation:\n" - - echo -e "\t [1] SD / MMC" - echo -e "\t [2] Compact Flash" - - echo "" - while true - do - echo -n "Your target: " - read junk - - case "$junk" in - 1) if (mount | grep -q "/media/card ") - then - rootfs_target="/media/card"; break - else - echo -e "\nInstallation target [/media/card] not mounted\n" - fi ;; - 2) if (mount | grep -q "/media/cf ") - then - rootfs_target="/media/cf"; break - else - echo -e "\nInstallation target [/media/cf] not mounted\n" - fi ;; - esac - done - - echo -e "\nPlease choose the type of this installation:\n" - - echo -e "\t [1] Imagefile (loopfile)" - echo -e "\t [2] Direct Install" - - echo "" - while true - do - echo -n "Install type: " - read junk - - case "$junk" in - 1) if test -x /sbin/mkfs.ext2 - then - rootfs_type="image" - break - else - echo -e "\nNOTE: mkfs.ext2 (from e2fsprogs-mke2fs) not found, loop-images not supported\n" - fi ;; - 2) rootfs_type="direct" ; break ;; - esac - done - - case "$rootfs_type" in - image) install_rootfs_image "$rootfs_target";; - direct) install_rootfs_direct "$rootfs_target";; - esac -} - -clear_directories(){ - test "$1" = "/" -o "$1" = "/ " && die "clear_directories(): You don't want to do that." - - ! test -d "$1" && die "clear_directories(): [$1] not found." - - for d in bin dev media proc sys usr boot etc lib mnt sbin tmp var - do - if test -d "$1/$d" - then - echo "Removing [$1/$d]..." - rm -rf "$1/$d" - fi - done - -} - - -install_rootfs_direct(){ - - mount | grep -q "$1 " || die "Installation target [$1] not mounted" - - echo -e "Do you want to remove existing directories from [$1]\n before installing the new rootfs?" - echo "" - - while true - do - echo -n "Remove old directories? [Y|n] " - read junk /dev/tty0 2>&1 - - case "$junk" in - Y|y|"") clear_directories "$1"; break ;; - esac - done - - echo "Please press to begin the installation" - read junk /dev/tty0 2>&1 - - test -d "$1" || die "Directory [$1] not found" - - echo -n "Installing rootfs, please wait..." - tar -xzf "$rootfs_source" -C "$1" >/dev/null 2>&1 && echo ok || die "tar -xzf \"$rootfs_source\" -C \"$1\" failed!" - - echo -n "Syncing drives..." - sync - echo "done" - -# umount "$1" - - echo "Press to bring up the altboot menu" - read junk /dev/tty0 2>&1 - exec /sbin/init.altboot -force - -} - -install_rootfs_image(){ - - mount | grep -q "$1 " || die "Installation target [$1] not mounted" - - echo "" - echo "Please enter a name for the image file." - echo "Do not use the character" - echo "" - - - while true - do - echo -n "Image name: " - read junk - - if test -n "$junk" - then - if test -e "$1/boot-images/${junk}-rootfs.bin" - then - echo -e "\nFile [$1/boot-images/${junk}-rootfs.bin] already exists." - - while true - do - echo -n "Overwrite? [y|N] " - read junk2 - - case "$junk2" in - Y|y) break;; - n|N|"") install_rootfs_image "$1" - exit 0;; - esac - done - rootfs_image_name="${junk}-rootfs.bin" - break - else - echo -n "Use [$junk] as name? [Y|n] " - read junk2 - - case "$junk2" in - "Y"|"y"|"") rootfs_image_name="${junk}-rootfs.bin" - break ;; - *) echo "err ]$junk]";; - esac - fi - fi - done - - echo "" - echo "Please enter the image size in MegaBytes" - echo "Must be at least 30Mb" - echo "" - - while true - do - echo -n "Image size: " - read junk - - junk="`echo "$junk" | sed "s/[a-zA-Z]//g"`" - - if test -n "$junk" - then - if test "$junk" -gt 29 - then - echo -n "Is [${junk}Mb] correct? [Y|n] " - read junk2 - - case "$junk2" in - Y|y|"") rootfs_image_size="$junk" - break ;; - esac - - else - echo "Image size of [${junk}Mb] is too small!" - fi - fi - done - - test -z "$rootfs_image_name" -o -z "$rootfs_image_size" && die "DEBUG: Empty VAR in install_rootfs_image()" - - echo "" - echo "Creating [$rootfs_image_name] (${rootfs_image_size}Mb) on [$1]" - echo "Please wait..." - mkdir -p "$1/boot-images" - - dd if=/dev/zero of="$1/boot-images/$rootfs_image_name" bs=1024k count=$rootfs_image_size >/dev/null - - echo -n "Creating an ext2 filesystem on $rootfs_image_name..." - losetup /dev/loop0 "$1/boot-images/$rootfs_image_name" || die "losetup /dev/loop0 \"$1/boot-images/$rootfs_image_name\" failed!" - mkfs.ext2 -m0 /dev/loop0 >/dev/null 2>&1 && echo done || die "mkfs.ext2 -m0 /dev/loop0 failed!" - - echo -n "Mounting loopfile..." - mkdir -p /media/image - mount /dev/loop0 /media/image && echo ok || die "mount /dev/loop0 /media/image failed!" - - echo -n "Installing rootfs, please wait..." - tar -xzf "$rootfs_source" -C "/media/image" >/dev/null 2>&1 && echo ok || die "tar -xzf \"$rootfs_source\" -C \"$1\" failed!" - - echo -n "Syncing drives..." - sync - echo "done" - - umount "/media/image" && losetup -d /dev/loop0 - - echo "Press to bring up the altboot menu" - read junk /dev/tty0 2>&1 - exec /sbin/init.altboot -force - -} - - - -#run_module - -case "$1" in -title) echo "$M_TITLE";; -flags) echo "$M_FLAGS";; -run) run_module "$2";; -esac diff --git a/packages/altboot/files/altboot-menu/Advanced/70-setKernel b/packages/altboot/files/altboot-menu/Advanced/70-setKernel deleted file mode 100644 index 50f61d034f..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/70-setKernel +++ /dev/null @@ -1,68 +0,0 @@ -# !/bin/sh -M_TITLE="Choose kernel for next boot" - -# Deprecated due to altbootctl -exit 0 - -# Only kernel 2.6 offers kexec support -uname -r | grep -q "^2.6" || exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot" - test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]" - - # Mount /proc, etc - # init_rootfs - - if test `ls -1 $KEXEC_KERNEL_DIR | grep -v "kexec.cfg" | wc -l | tr -d " "` -gt 1 - then - echo -e "\nSelect the kernel for use of the next boot:\n" - - cnt=1 ; reset_pref "kexec_klist" - for k in `ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" ` - do - echo -e "\t[$cnt] $k" - set_pref "kexec_klist" "$cnt" "$k" - - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Select a kernel: " - read junk - - #echo_pref kexec_klist - - get_pref "kexec_klist" "$junk" KEXEC_SELECTED_KERNEL && break - - done - else - KEXEC_SELECTED_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `" - fi - - echo -e "\nUsing [$KEXEC_SELECTED_KERNEL]" - - if ! test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" - then - echo -e "\nWARNING: This kernel has not been configured." - echo -e "It will only boot correctly if CMDLINE is compiled in.\n" - fi - - export USE_KEXEC_ON_NEXT_BOOT=yes - export KEXEC_SELECTED_KERNEL - show_menu -} - - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec deleted file mode 100644 index 1b8fc6e547..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec +++ /dev/null @@ -1,248 +0,0 @@ -# !/bin/sh -M_TITLE="Configure kexec CMDLINE" - -# Deprecated due to altbootctl -exit 0 - - -# Only kernel 2.6 offers kexec support -uname -r | grep -q "^2.6" || exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot" - test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]" - - # Mount /proc, etc - init_rootfs - - if test `ls -1 $KEXEC_KERNEL_DIR | grep -v "kexec.cfg" | wc -l | tr -d " "` -gt 1 - then - echo -e "\nPlease select the kernel you want to configure:\n" - - cnt=1 ; reset_pref "kexec_klist" - for k in `ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" ` - do - echo -e "\t[$cnt] $k" - set_pref "kexec_klist" "$cnt" "$k" - - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Select a kernel: " - read junk - - get_pref "kexec_klist" "$junk" KEXEC_KERNEL && break - - done - else - KEXEC_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `" - fi - - echo -e "\nUsing [$KEXEC_KERNEL]" - - configure_rootdev - configure_roottype - configure_verbose - configure_custom - - CMDLINE="console=ttyS0,115200n8 console=tty1 dyntick=enable fbcon=rotate:1 noinitrd root=$KERNEL_ROOTDEV rootfstype=$KERNEL_ROOTFSTYPE $KERNEL_VERBOSE $KERNEL_CUSTOM" - - echo -en "\nWriting CMDLINE to $KEXEC_KERNEL.kexec.cfg..." - echo "$CMDLINE" > $KEXEC_KERNEL.kexec.cfg && echo ok || mdie FAILED - - show_menu -} - -configure_rootdev() { - - echo -e "\nPlease choose a root device (root=*):\n" - - cnt=1 ; reset_pref "kexec_rootdev" - for root in /dev/mtdblock2 /dev/hda1 "Manual Entry" - do - echo -e "\t[$cnt] $root" - set_pref kexec_rootdev "$cnt" "$root" - let cnt=cnt+1 - done - - echo "" - - while true - do - echo -n "Select a root device: " - read junk - - get_pref kexec_rootdev "$junk" KERNEL_ROOTDEV && break - done - - if test "$KERNEL_ROOTDEV" = "Manual Entry" - then - echo "" - - KERNEL_ROOTDEV="" - - while test -z "$KERNEL_ROOTDEV" - do - while true - do - echo -n "Enter the root device: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_ROOTDEV="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_ROOTDEV] as root device" -} - -configure_roottype() { - - echo -e "\nPlease choose a rootfs type (rootfs=*):\n" - - cnt=1 ; reset_pref "kexec_rootfstype" - for root in jffs2 ext2 ext3 "Manual Entry" - do - echo -e "\t[$cnt] $root" - set_pref kexec_rootfstype "$cnt" "$root" - let cnt=cnt+1 - done - - echo "" - - while true - do - echo -n "Select a rootfs type: " - read junk - - get_pref kexec_rootfstype "$junk" KERNEL_ROOTFSTYPE && break - done - - if test "$KERNEL_ROOTFSTYPE" = "Manual Entry" - then - echo "" - - KERNEL_ROOTFSTYPE="" - - while test -z "$KERNEL_ROOTFSTYPE" - do - while true - do - echo -n "Enter the rootfs type: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_ROOTFSTYPE="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_ROOTFSTYPE] as rootfs type" -} - -configure_verbose() { - echo -e "\nDo you want to see kernel messages? ([quiet | debug]):\n" - - echo -e "\t[1] Yes" - echo -e "\t[2] No" - - echo "" - - while true - do - echo -n "Select one of the above: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - - test "$junk" = 1 && KERNEL_VERBOSE="debug" || KERNEL_VERBOSE="quiet" - -} - -configure_custom() { - echo -e "\nDo you want to set custom kernel options?\n" - - echo -e "\t[1] Yes" - echo -e "\t[2] No" - - echo "" - - while true - do - echo -n "Select one of the above: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - - if test "$junk" = 1 - then - - echo "" - - KERNEL_CUSTOM="" - - while test -z "$KERNEL_CUSTOM" - do - while true - do - echo -n "Enter kernel options: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_CUSTOM="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_CUSTOM] as custom kernel options" - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs deleted file mode 100644 index 2d305e349f..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs +++ /dev/null @@ -1,323 +0,0 @@ -# !/bin/sh -M_TITLE="Copy rootfs to SD/CF" -M_FLAGS="noRemember" - -# Unfinished script. -exit 0 - -ask_target() { - available_disks="`mount | grep "/media" | grep -v ram | awk '{print $3}'`" - - if test -z "$available_disks" - then - die "No mounted targets found!" - fi - - cnt=1 - for d in $available_disks - do - echo -e "\t[$cnt] $d" - let cnt=$cnt+1 - done - - while test -z "$ROOTFS_TARGET" - do - echo -n "Target: " - read junk /dev/null 2>&1 - then - echo -n "Use [$junk]MB? [y|n] " - read junk2 - if test "$junk2" = y - then - ROOTFS_IMAGE_SIZE="$junk" - fi - fi - done - - echo -e "\nPlease enter a name for the image file." - echo "The name must _not_ contain whitespaces or the '-' sign." - - while test -z "$ROOTFS_IMAGE_NAME" - do - echo -n "File name: " - read junk - - if ! test -z "$junk" - then - echo -n "Use [$junk] as image name? [y|n] " - read junk2 - - if test "$junk2" = y - then - ROOTFS_IMAGE_NAME="$junk" - fi - fi - done - - echo -e "\nDo you want to format [$ROOTFS_TARGET_DEV] to the ext2 filesystem?" - - while true - do - echo -n "Format to ext2? [y|n] " - read junk - case "$junk" in - y) format_target - break ;; - n) break ;; - esac - done - - /etc/init.d/devices start - - echo -en "\nCreating image file [$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin] (${ROOTFS_IMAGE_SIZE}MB)..." - mkdir -p "$ROOTFS_TARGET/$IMAGE_PATH" - - dd if=/dev/zero of="$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" bs=1024k count=$ROOTFS_IMAGE_SIZE >/dev/null 2>&1 && echo ok || die "FAILED" - losetup /dev/loop1 "$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" - - echo -n "Creating filesystem..." - mkfs.ext2 -m0 /dev/loop1 >/dev/null 2>&1 && echo ok || die FAILED - - mkdir -p /media/temp - mount /dev/loop1 /media/temp || die "mount /dev/loop1 /media/temo FAILED!" - - copy_files - -} - -copy_files() { - echo -e "\nCopying files..." - - exclude_list="tmp sys proc var dev media root" - mkdir_list="var proc sys dev media/card media/cf /media/hdd" - - if (cat /etc/fstab | grep -q "/home") - then - echo "Note: /home appears to be mounted on a different flash partition: not copying /home" - exclude_list="$exclude_list home" - mkdir_list="$mkdir_list home/root" - - fi - - - - source_dirs="`ls -1 /`" - - echo -n "Excluding [" - for d in $exclude_list - do - echo -n "$d " - source_dirs="`echo "$source_dirs" | grep -v "$d"`" - done - echo "] from copy" - - - cd / - for dir in $source_dirs - do - if test -d "$dir" - then - echo -n "Copying [$dir]..." - cp -a $dir /media/temp && echo ok || echo FAILED - fi - done - - for dir in $mkdir_list - do - mkdir -p /media/temp/$dir - done - - rm /media/temp/etc/rcS.s/S39sd - -} -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo -e "${C_RED}* * * * * WARNING * * * * *${C_RESET}" - echo -e "${C_RED}Continueing will delete the content of the selected target device.\nTHIS IS NO JOKE. If you do now know what this menu-item does, exit NOW${C_RESET}" - - mount -o remount,rw / - - while true - do - echo -en "\nContinue? [y|n] " - read junk /dev/null 2>&1 && echo ok || echo "FAILED" -# -# echo -n "Trying to mount SD card..." -# /etc/init.d/sd start >/dev/null 2>&1 -# sleep 3 -# /etc/sdcontrol insert >/dev/null 2>&1 && echo ok || echo "FAILED" - - #exit 0 - echo -e "\nPlease select the target device:" - - # Sets ROOTFS_TARGET* - ask_target - - # Sets ROOTFS_TARGET_TYPE ([direct | image] - ask_format - - # Ask confirmation - ask_confirm - - case "$ROOTFS_TARGET_TYPE" in - direct) direct_install;; - image) image_install;; - esac -} - -case "$1" in -title) echo "$M_TITLE";; -flags) echo "$M_FLAGS";; -run) run_module;; -esac diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func deleted file mode 100644 index ae38c5b437..0000000000 --- a/packages/altboot/files/altboot.func +++ /dev/null @@ -1,870 +0,0 @@ -#! /bin/sh - -C_RED="\033[31m" -C_YELLOW="\033[35m" -C_BLUE="\033[34m" -C_WHITE="\033[38m" -C_RESET="\033[0m" - - -# This function checks for the presence of a real filesystem and loop-images on the target -# $1 = folder of rootfs, $2 = runlevel (defaults to 5) -# $2 = name of calling module -check_target() { - # Check if there is a /sbin/init or /sbin/init.sysvinit on the card - if test -x $1/sbin/init -o -x $1/$REAL_INIT - then - real_fs_found=1 - else - echo -e "Note: No INIT [$REAL_INIT] found on target" - fi - - # Check for loop-images - if (ls $1/$IMAGE_PATH/*rootfs.bin) >/dev/null 2>&1 - then - image_found=1 - else - echo "Note: No boot-images found in [$1/$IMAGE_PATH]" - fi - - # Check if we have both, a real fs and boot-images. If so, ask the user what to boot - if test "$real_fs_found" = 1 -a "$image_found" = 1 - then - echo -e "\nI have found a real filesystem and boot-images on the target" - echo -e "What do you want to boot?\n" - - echo -e "\t[1] The real filesystem" - echo -e "\t[2] A loop-image" - echo "" - - while test -z "$ans" - do - echo -n "Your choice: " - - if test "$AUTOBOOT" != "yes" - then - read junk < "$OUT_TTY" - else - if test -e /etc/.altboot-real-or-loop.last - then - junk="`cat /etc/.altboot-real-or-loop.last`" - test -z "$junk" && read junk < "$OUT_TTY" || echo "$junk (autoboot)" - else - read junk < "$OUT_TTY" - fi - fi - - if test "$junk" = 1 -o "$junk" = 2 - then - ans="$junk" - echo "$junk" > /etc/.altboot-real-or-loop.last - fi - done - - case "$ans" in - 1) pivot_realfs "$1" "$2">"$OUT_TTY";; - 2) pivot_image "$1" "$2">"$OUT_TTY";; - esac - - exit 0 - fi - - # Boot a real filesystem - test "$real_fs_found" = 1 && pivot_realfs "$1" >"$OUT_TTY" - - # Boot a loop-image - test "$image_found" = 1 && pivot_image "$1" >"$OUT_TTY" - - if test "$real_fs_found" != 1 -a "$image_found" != 1 - then - mdie "No direct-install or loop-images found. Nothing to do!" - fi -} - -boot_new_rootfs_splash() { -C_RED="\033[37;44m" -C_RESET="\033[0m" - - echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" - echo -e "${C_RED}| |${C_RESET}" - echo -e "${C_RED}| Booting the selected rootfs... |${C_RESET}" - echo -e "${C_RED}| |${C_RESET}" - echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" - -} - -# This function pivot_root's into a real filesystem calling $newrootfs/sbin/init -# $1 = The new rootfs -pivot_realfs() { - #test -z "$2" && RL="5" || RL="$2" - mkdir -p $1/media/ROM || die "mkdir -p $1/media/ROM failed" - - mount -o remount,ro / >/dev/null 2>&1 - - test "$ENABLE_IMAGECONF" = yes && image_conf $1 - - do_pivot "$1" "$RL" -} - -# This function loop-mounts an image-file and pivot_root's into it -# $1: The new rootfs -pivot_image() { - #test -z "$2" && RL="5" || RL="$2" - cd $1/$IMAGE_PATH - - # Check for rootfs images on the card - if test "`ls *rootfs.bin | wc -l | tr -d " "`" -gt 1 - then - echo -e "\n\nPlease select a rootfs:\n" - - # Show all available images - x=0 - for file in `ls *rootfs.bin` - do - let x=$x+1 - echo -e "\t\t[$x] $file" - done - - echo "" - - IMAGE_NAME="" - while test -z "$IMAGE_NAME" - do - echo -en "Please choose one of the above: " - if test "$AUTOBOOT" != "yes" - then - read junk < "$OUT_TTY" - else - if test -e /etc/.altboot-loopimage.last - then - junk="`cat /etc/.altboot-loopimage.last`" - test -z "$junk" && read junk < "$OUT_TTY" || echo "$junk (autoboot)" - else - read junk < "$OUT_TTY" - fi - fi - - x=0 - for file in `ls *rootfs.bin` - do - let x=$x+1 - if test "$x" = "$junk" - then - IMAGE_NAME="$file" - echo "$junk" > /etc/.altboot-loopimage.last - fi - done - done - else - IMAGE_NAME="`ls *rootfs.bin`" - test -z "$IMAGE_NAME" && die "No rootfs found (*rootfs.bin) in $1/$IMAGE_PATH" - fi - - - echo "" - - mkdir -p /media/image || die "mkdir -p /media/image failed" - - LOOP_MODULE="$(find /lib/modules/`uname -r`/ -name "loop.ko")" - test -n "$LOOP_MODULE" && ( insmod "$LOOP_MODULE" ; sleep 3 ) - - ! test -e /dev/loop0 && mknod /dev/loop0 b 7 0 - - losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!" - check_fs /dev/loop0 $IMAGE_TYPE - - echo -e "\n* * * Mounting rootfs image * * *\n" - - # Busybox's "mount" doesn't seem to like "-o loop" for some reason - # It works on collie and b0rks on poodle. - if [ "$IMAGE_TYPE" = "" ]; then - IMAGE_TYPE="auto" - fi - - # If mount fails it has the tendency to spew out a _lot_ of error messages. - # We direct the output to /dev/null so the user can see which step actually failed. - mount /dev/loop0 -t $IMAGE_TYPE /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!" - - mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed" - - test "$ENABLE_IMAGECONF" = yes && image_conf /media/image - - do_pivot /media/image "$RL" -} - -#$1=mountpoint of the soon-to-be rootfs, $2=Runlevel -do_pivot(){ - - if test "$USE_KEXEC_ON_NEXT_BOOT" = yes - then - if test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" - then - CMDLINE="--append=\"`cat $KEXEC_SELECTED_KERNEL.kexec.cfg`\"" - else - CMDLINE="" - echo "WARNING: This kernel has not been configured!" - echo "Trying to boot anyway..." - fi - - echo "$KEXEC_BIN -l $KEXEC_SELECTED_KERNEL $CMDLINE" - $KEXEC_BIN -l $KEXEC_SELECTED_KERNEL $CMDLINE - sync - - read junk - $KEXEC_BIN -e - exit 0 - fi - - - echo -n "Pivoting root..." - if (/sbin/pivot_root "$1" "$1/media/ROM") - then - echo "Success" - - # This is important since we are still cd'ed into the old root - cd / - - ! test -d "$1" && mkdir -p "$1" - - # Move mountpoints from the old rootfs into the new one. - # The *real* mount is kinda touchy feely about that - /bin/busybox mount -o move /media/ROM/proc /proc >/dev/null 2>&1 - - for mpt in ` mount | grep "/media/ROM/" | awk '{print $3}'` - do - new_mpt="`echo "$mpt" | sed -n "s/\/media\/ROM//p"`" - - echo "Moving mountpoint [$mpt] -> [$new_mpt]" >"$OUT_TTY" 2>&1 - - ! test -d "$new_mpt" && mkdir -p "$new_mpt" - /bin/busybox mount -o move "$mpt" "$new_mpt" - done - - clear - boot_new_rootfs_splash - echo "Calling INIT" - - exec /usr/sbin/chroot . $REAL_INIT $2 >"$OUT_TTY" 2>&1 - #exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1 - else - echo "FAILED" - die "* * * pivot_root failed! * * *" - fi - -} - -# $1: Path to mounted rootfs -image_conf(){ - ! test -d "$1" && die "image_conf: [$1] not found / no directory" - - test -e "$1/etc/.image_conf.done" && return - - echo -e "\n\n* * * rootfs configuration * * *\n" - echo -e "This setup lets you reconfigure your new rootfs." - echo "Most probably the rootfs is configured with" - echo "defaults based on a flash installation." - echo "If unsure, go with the defaults by pressing ." - echo "" - - if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/home " ) - then - while true - do - echo "Usually your /home directory is located on another flash partition." - echo -n "Do you want me to move /home inside the loop-image? [N|y] " - read junk - - if test "$junk" = "y" -o "$junk" = "Y" - then - cat $1/etc/fstab | sed "/.*\/home.*/s/\/home/\/home.flash/" > $1/etc/fstab_ - mv $1/etc/fstab_ $1/etc/fstab - - mkdir -p $1/home.flash - break - fi - - test "$junk" = "" -o "$junk" = n -o "$junk" = N && break - done - - fi - - echo "" - - if ( cat $1/etc/ipkg.conf | grep -q ^lists_dir ) - then - while true - do - echo -e "Wasting RAM is never a good idea.\nOnly say Y if your rootfs is very small in size" - echo -en "Do you want to store ipkg package data\nin RAM? [N|y] " - read junk - - if test "$junk" = "" -o "$junk" = n -o "$junk" = N - then - cat $1/etc/ipkg.conf | sed "/^lists_dir.*/s/\(.*\)/#\ \1/"> $1/etc/ipkg.conf_ - mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf - break - fi - - test "$junk" = "y" -o "$junk" = "Y" && break - done - fi - - echo "" - - if ( cat $1/etc/ipkg.conf | grep -q "^dest sd" ) - then - while true - do - echo -en "Do you want to keep the SD, CF and /home\nipkg install targets? [N|y] " - read junk - - if test "$junk" = "" -o "$junk" = n -o "$junk" = N - then - cat $1/etc/ipkg.conf | sed "/^dest\ \(sd\|cf\|home\).*/s/\(.*\)/#\ \1/" > $1/etc/ipkg.conf_ - mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf - break - fi - - test "$junk" = "y" -o "$junk" = "Y" && break - done - fi - - - touch "$1/etc/.image_conf.done" -} - -# This functions configures the master password for altboot if none is set -set_password() { - - test -e /etc/altboot.pwd && . /etc/altboot.pwd - - mount -o remount,rw / - if test -z "$MASTER_PASSWORD" -a "$ENABLE_DEBUG" != yes - then - echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF, USB-Storage and NFS" - echo -e "\nFor security reasons altboot requires a password\nto boot into init=/bin/sh." - echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}\n" - - while true - do - echo -en "\nNew password: " - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk1 < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - if ! test -z "$junk1" - then - echo -en "\nRepeat: " - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk2 < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - echo "" - - if test "$junk1" = "$junk2" - then - crypt_pw="`echo "$junk1" | md5sum | awk '{print $1}'`" - - if test -e "/etc/altboot.pwd" - then - sed "/^MASTER_PASSWORD/s/\(.*\=\).*/\1\"$crypt_pw\"/" "${ALTBOOT_CFG_FILE}" > ${ALTBOOT_CFG_FILE}_ - mv ${ALTBOOT_CFG_FILE}_ ${ALTBOOT_CFG_FILE} - MASTER_PASSWORD="$crypt_pw" - echo "Password changed." - else - echo "MASTER_PASSWORD=\"$crypt_pw\"" > /etc/altboot.pwd - echo "Password installed" - fi - - break - else - echo -e "Passwords didn't match, try again\n" - fi - fi - done - fi - -} - -# This function asks for altboots master password. It only returns if the correct password was supplied -verify_master_pw() { - - test -e /etc/altboot.pwd && . /etc/altboot.pwd - - if test -n "$MASTER_PASSWORD" -a "$MASTER_PASSWORD" != "[none]" - then - auth_timeout="3" - - echo -e "\nPlease enter your altboot master password" - - cnt=0 - while true - do - let cnt=$cnt+$auth_timeout - echo -n "Password: " - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - if test "`echo "$junk" | md5sum | awk '{print $1}'`" = "$MASTER_PASSWORD" - then - break - else - echo "[`echo "$junk" | md5sum | awk '{print $1}'`]" - echo "[$MASTER_PASSWORD]" - echo "Wrong password, sleeping $cnt seconds..." - sleep $cnt - -# if test "$cnt" -gt 10 -# then -# break -# fi - fi - done - - echo "" - fi -} - - -check_fs() { - if [ "$FSCK_IMAGES" = "yes" ] - then - FSCK="" - if [ "$2" = "" ]; then - FSTYPE="ext2" - else - FSTYPE="$2" - fi - case "$FSTYPE" in - ext2 | ext3) - if [ -e /sbin/fsck.ext3 ]; then - FSCK="/sbin/fsck.ext3" - elif [ -e /sbin/e3fsck ]; then - FSCK="/sbin/e3fsck" - elif [ -e /sbin/fsck.ext2 ]; then - FSCK="/sbin/fsck.ext2" - elif [ -e /sbin/e2fsck ]; then - FSCK="/sbin/e2fsck" - fi - test -n "$FSCK" && FSCK="$FSCK -p" - ;; - vfat) - if [ -e /sbin/dosfsck ]; then - FSCK="/sbin/dosfsck -a" - fi - ;; - esac - -# debug_echo "check_fs() FSCK / FSTYPE: [$FSCK] / [$FSTYPE]" - - if [ "$FSCK" = "" ]; then - echo "Could not find fsck for $FSTYPE!" - else - echo "Checking file system on $1" - $FSCK $1 || sleep 2 - fi - fi -} - -# Make the initial rootfs a bit more usable -init_rootfs(){ -# echo -n "Mounting rootfs rw..." - mount -o remount,rw / || die "mount -o remount,rw / failed" - - mount | grep -q "/proc " >/dev/null 2>&1 || mount proc -t proc /proc >"$OUT_TTY" 2>&1 - - if ( uname -r | grep -q "2.6." ) - then - mount | grep -q "/sys " >/dev/null 2>&1 || mount sys -t sysfs /sys >"$OUT_TTY" 2>&1 - fi - - /etc/init.d/devices start || die "FAILED" -} - -mount_sd(){ - if mount | grep -q "$SD_MOUNTPOINT" - then - echo "Note: $SD_MOUNTPOINT is already mounted" - else - # We can't trust that the SD device file is there when running kernel 2.6 w/ udev - # and starting udev at this point may not be the best idea... - if `uname -r | grep -q "2.6"` - then - #Let's just assume the device file name never changes... - dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`" - part_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`" - ! test -e /dev/mmcblk${dev_no} && mknod /dev/mmcblk${dev_no} b 254 0 - ! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no - fi - - # Kernel 2.6 has the SD driver compiled into the kernel - if test -n "$SD_KERNEL_MODULE" - then - echo "Loading SD kernel module..." - if ( echo "$SD_KERNEL_MODULE" | grep -q "^/" ) - then - echo -e "\t- Using full path for SD module" - SD_PATTERN="`basename "$SD_KERNEL_MODULE" | sed "s/\.ko//;s/\.o//"`" - - if ( lsmod | grep -q "^$SD_PATTERN" ) - then - echo -e "\t- Already loaded..." - else - echo -e "\t- Loading..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - fi - - else - echo -e "\t- Searching [$SD_KERNEL_MODULE]" - SD_KERNEL_MODULE="$(find /lib/modules/`uname -r`/ -name "$SD_KERNEL_MODULE")" - echo -e "\t- Assuming module is [$SD_KERNEL_MODULE]" - - SD_PATTERN="`basename "$SD_KERNEL_MODULE" | sed "s/\.ko//;s/\.o//"`" - - if ( lsmod | grep -q "^$SD_PATTERN" ) - then - echo -e "\t- Already loaded..." - else - echo -e "\t- Loading..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - fi - fi - fi - - sleep 3 - - check_fs "$SD_DEVICE" - - if ! mount | grep -q "$SD_MOUNTPOINT" - then - echo -n "Mounting $SD_MOUNTPOINT..." >"$OUT_TTY" - - if test "$1" = ingore_errors - then - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 || echo "Could not mount SD card" - else - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 || die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - fi - else - echo "NOTE: Some sort of auto-mounting is going on..." - fi - fi - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 -} - -mount_cf(){ - if mount | grep -q "/media/cf " - then - echo "Note: /media/cf is already mounted" - else - if ( cat /etc/fstab | grep -v "^#" | grep -q "/media/cf" ) - then - # As of kernel 2.6.16, /e/i/pcmcia is replaced by udev - if test -x /etc/init.d/pcmcia - then - /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active" - else - for n in 1 2 3 - do - ! test -e "/dev/hda$n" && mknod /dev/hda$n b 3 $n - done - fi - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - - mount /media/cf -o async - else - echo "Note: Your system's fstab does not include an entry for /media/cf" - fi - fi -} - -mount_home(){ - if mount | grep -q "/home " - then - echo "Note: /home is already mounted" - else - - if ( cat /etc/fstab | grep -v "^#" | grep -q "/home " ) - then - echo "Mounting /home" - home_fstab="`grep "/home " /etc/fstab`" - home_dev="`echo "$home_fstab" | awk '{print $1}'`" - home_fs="`echo "$home_fstab" | awk '{print $3}'`" - home_options="`echo "$home_fstab" | awk '{print $4}'`" - - mount -t "$home_fs" -o $home_options "$home_dev" /home - else - echo "Note: Your system's fstab does not include an entry for /home" - fi - fi -} - -show_menu() { - - echo -e "\nPress to return to the menu" - read junk - - test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force<"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -mdie() { - echo -e "${C_RED}ERROR:${C_RESET}${C_WHITE} $1${C_RESET}" >"$OUT_TTY" - - echo -e "\nPress to return to the menu" - read junk - - test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force<"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -# $1: uniq name, $2 identifier, $3 value -set_pref() { - data_name="$1" - data_id="$2" - data_value="$3" - - #debug_echo "[$1] [$2] [$3]" - #export "${data_name}"="`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // | sed s/^$data_id.*//`" - - if test -z "$3" - then - debug_echo "set_pref(): WARNING, writing empty value to $data_name / $data_id! THIS WILL BREAK THINGS" - #data_value=" " - fi - export "${data_name}"="`eval echo -e \\$${data_name} `$data_id##$data_value###" -} - -# $1: uniq name -reset_pref() { - data_name="$1" - export "${data_name}"="" -} - -echo_pref() { - data_name="$1" - echo "****** $1 ******" - echo "`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // `" - echo "******" -} - -dump_pref() { - data_name="$1" - echo "`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // `" - - #echo "-- `eval echo ${data_name}` --" - #debug_echo "[$menu_fileflags]" -} - -# $1 = name, $2 = cache_file -export_pref() { - data_name="$1" - echo "`eval echo -e ${data_name}`" > "$2" -} - -# $1 = name, $2 = cache_file -import_pref() { - data_name="$1" - data_id="$2" - - #debug_echo "[$1] [$2] [$3]" - - if test -z "$3" - then - debug_echo "set_pref(): WARNING, writing empty value to $data_name / $data_id! THIS WILL BREAK THINGS" - #data_value=" " - fi - export "${data_name}"="`cat "$2"`" - -} - -# $1: uniq name, $2 identifier, $3 out var -get_pref() { - data_name="$1" - data_id="$2" - data_out="$3" - data_list="`eval echo -e \\$${data_name}`" - - #echo "data_list: [$data_list]" - #data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g"|sed s/^\ // | grep "^$data_id##" | sed -n "s/.*\#\(.*\)$/\1/p"`" - #data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g"|sed s/^\ // | sed -n "/^$data_id/s/.*\#\(.*\)$/\1/p"`" - data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g" | sed -n "s/^\ //;/^$data_id\#/s/.*\#\(.*\)$/\1/p"`" - #echo "WERT: [$data_value]" - - export "${data_out}"="$data_value" - test -n "$data_value" && return 0 -} - -debug_echo() { - test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" >"$OUT_TTY" 2>&1 -} - -start_networking() { - - test -z "$1" && mdie "No remote host configured, check /etc/fstab for NFS hosts" - - if test "$USB_NETWORKING_AVAILABLE" = "yes" - then - echo "" - echo "Select the type of your network connection:" - echo "" - echo -e "\t[1] LAN or WLAN NIC" - echo -e "\t[2] USB Connection" - echo "" - - if test "$AUTOBOOT" != "yes" -o ! -e /etc/.altboot-lanselect.last - then - while true - do - echo -n "Connection Type: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - else - junk="`cat /etc/.altboot-lanselect.last`" - test -z "$junk" && junk=1 - - echo "Connection Type: $junk (autoboot)" - fi - - case "$junk" in - 1) NW_TYPE="NIC" - ;; - 2) NW_TYPE="USB" - ;; - esac - - echo "$junk" > /etc/.altboot-lanselect.last - else - NW_TYPE=NIC - fi - - - - # Needed for NFS - /etc/init.d/portmap start >/dev/null 2>&1 || die "/etc/init.d/portmap start failed!" - - # For some reason NFS mounts hang if /e/i/networking is not run. - # For the time beeing I'm too lazy to investigate ;) - /etc/init.d/networking start >/dev/null 2>&1 || die "/etc/init.d/networking start failed!" - - sleep 2 - - if test "$NW_TYPE" = "NIC" - then - # After the PCMCIA service is started, an inserted WLAN card should automatically - # activate itself. - - if test -x /etc/init.d/pcmcia - then - echo -e "\nRunning cardctl to setup networking..." - /etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!" - sleep 3 - else - # With kernel 2.6.16+ udev is used - echo -e "\nRunning udevd to setup networking..." - ps ax | grep -v grep | grep -q udevd || /etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!" - - # Stop udev to work around some very ugly (yet harmless) error messages on boot - /etc/init.d/udev stop >/dev/null 2>&1 - fi - fi - - if test "$NW_TYPE" = "USB" - then - echo "" - for module in $USB_NW_MODULES - do - echo "modprobing [$module]" - modprobe $module || die "modprobe $module FAILED" - done - - ifdown "$USB_NW_DEVICE" >/dev/null 2>&1 - - - echo -e "\nPlease make sure that usb0 is up on your PC and hit ." - read junk - - ifup "$USB_NW_DEVICE" - fi - - WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`" - - if test -z "$WLAN_NIC" - then - # cardctl needs some time.... - echo -n "Waiting for WLAN card.." - timeout=0 - while test "$timeout" -lt 10 - do - WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`" - test -n "$WLAN_NIC" && break - echo -n "." - let timeout=$timeout+1 - sleep 1 - done - - if test -z "$WLAN_NIC" - then - debug_echo "WARNING: WLAN_NIC is empty!\n" - debug_echo "Filter result: [$WLAN_NIC]" - debug_echo "iwconfig: [`iwconfig`]" - mdie "No network interface found" - fi - fi - - # WLAN with DHCP needs some time to get a lease, set up the routing, etc. - echo -n "Waiting for host [$1] on [$WLAN_NIC]." - cnt=0 - while true - do - if (ping -c 1 $1) >/dev/null 2>&1 - then - echo " found" - break - else - if test "$cnt" = 30 -o "$cnt" = 60 - then - echo "" - echo "WARNING: $NW_TYPE didn't activate in $cnt seconds!" - - if test "$cnt" = 30 - then - let cnt=$cnt+1 - - if test "$NW_TYPE" = "NIC" - then - echo "Restarting udhcpc for [$WLAN_NIC]" - killall udhcpc - - udhcpc -i "$WLAN_NIC" -H `cat /etc/hostname` >"$OUT_TTY" 2>&1 - fi - - if test "$NW_TYPE" = "USB" - then - echo "ifdown/up $USB_NW_DEVICE..." - ifdown "$USB_NW_DEVICE" - sleep 1 - ifup "$USB_NW_DEVICE" - fi - - else - mdie "Failed to activate $NW_TYPE!" - break - fi - else - echo -n "." - let cnt=$cnt+1 - fi - fi - sleep 1 - done - - -} diff --git a/packages/altboot/files/altboot.rc/.mtn2git_empty b/packages/altboot/files/altboot.rc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot.rc/Readme.txt b/packages/altboot/files/altboot.rc/Readme.txt deleted file mode 100644 index 985e1fe7d0..0000000000 --- a/packages/altboot/files/altboot.rc/Readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Scripts (*.sh) in this folder are run by altboot before printing the menu. -Note: The rootfs is still mounted ro at this point. diff --git a/packages/altboot/files/altboot.rc/disable_printk.sh b/packages/altboot/files/altboot.rc/disable_printk.sh deleted file mode 100644 index af15adec44..0000000000 --- a/packages/altboot/files/altboot.rc/disable_printk.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -mount proc -t proc /proc >/dev/null 2>&1 - -echo 0 > /proc/sys/kernel/printk - diff --git a/packages/altboot/files/altboot.rc/loadkeymap.sh b/packages/altboot/files/altboot.rc/loadkeymap.sh deleted file mode 100644 index 97cff13dbb..0000000000 --- a/packages/altboot/files/altboot.rc/loadkeymap.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Note: With kernel 2.6 the standard keymap is unusable -test -x /etc/init.d/keymap && /etc/init.d/keymap start >/dev/null 2>&1 - -# Do not exit w/ errorcode when the if above fails -/bin/true - diff --git a/packages/altboot/files/altboot.rc/playbeep.sh b/packages/altboot/files/altboot.rc/playbeep.sh deleted file mode 100644 index b41f098630..0000000000 --- a/packages/altboot/files/altboot.rc/playbeep.sh +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: playbeep.sh -# Date: 12-Apr-06 - -if test -x /usr/sbin/alsactl -a -e /etc/modules -a "$ENABLE_SOUND" = yes -then - for module in `cat /etc/modules | grep snd | grep -v ^#` - do - #echo "loading $module" - modprobe $module >/dev/null 2>&1 - done - - mount -o remount,rw / - - init_rootfs >/dev/null 2>&1 - - ! test -e /dev/audio && mknod /dev/audio c 14 4 - ! test -e /dev/dsp && mknod /dev/dsp c 14 3 - - mkdir /dev/snd >/dev/null 2>&1 - mknod /dev/snd/controlC0 c 116 0 >/dev/null 2>&1 - mknod /dev/snd/pcmC0D0c c 116 24 >/dev/null 2>&1 - mknod /dev/snd/pcmC0D0p c 116 16 >/dev/null 2>&1 - mknod /dev/snd/timer c 116 33 >/dev/null 2>&1 - /usr/sbin/alsactl restore >/dev/null 2>&1 - - test -e /usr/share/sounds/beep.raw && cat /usr/share/sounds/beep.raw > /dev/dsp -fi - -/bin/true diff --git a/packages/altboot/files/altbootctl b/packages/altboot/files/altbootctl deleted file mode 100755 index 58976afd0d..0000000000 --- a/packages/altboot/files/altbootctl +++ /dev/null @@ -1,311 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: hentges-setup.sh -# Date: 03-Jun-06 - -die() { - echo -e "$*" - exit 1 -} - - -PERMANENT_CFG="/etc/altboot-`uname -r | cut -c1-3`.cfg" -TEMPORARY_CFG="/etc/altboot-`uname -r | cut -c1-3`.cfg.next-reboot" - -CFG="$PERMANENT_CFG" -SCRIPT_CONFIG="/etc/altbootctl.conf" - -test -e "$SCRIPT_CONFIG" && . "$SCRIPT_CONFIG" || die "$SCRIPT_CONFIG not found" - -# $1= Setting, $2 = new value -set_pref() { - - if ( cat "$CFG" | grep -q "$1" ) - then - cat "$CFG" | sed "/^$1/s/\(.*\)\=\(.*\)/\1\=\"$2\"/" > ${CFG}_ - mv ${CFG}_ ${CFG} - else - echo "$1=\"$2\"" >> "${CFG}" - fi -} - -# $1= Setting -get_pref() { - n="$1" - value="`cat "${CFG}" | sed -n "/^$n/s/\(.*\)\=\\"\(.*\)\\"/\2/p"`" - #echo "cat "${CFG}" | sed -n "/^$n/s/\(.*\)\=\"\(.*\)\"/\2/p"" - test -z "$value" && die "Couldn't get value for [$n]" - echo "$value" -} - -ask_pref() { - SETTING_NAME="$1" - - SETTING_TEXT_="${SETTING_NAME}_TEXT" - SETTING_TEXT="`eval echo -e \\$${SETTING_TEXT_}`" - - SETTING_VALUES_="${SETTING_NAME}_VALUES" - SETTING_VALUES="`eval echo -e \\$${SETTING_VALUES_}`" - - SETTING_OLD_VALUE="`get_pref "$SETTING_NAME"`" - test -z "$SETTING_TEXT" -o -z "$SETTING_VALUES" && die "ask_pref: [$1] -> [$SETTING_TEXT] [$SETTING_VALUES]" - - #echo "[$1] -> $SETTING_OLD_VALUE" - #echo -e "$SETTING_TEXT" - - - if test "$SETTING_VALUES" = "" - then - while true - do - echo -e "\nPlease enter a new value [$SETTING_OLD_VALUE]" - echo -en "Your Choice: " - read junk - - echo "" - - while true - do - echo -n "Is the new value of [$junk] correct? [Y|n] " - read junk2 - - case "$junk2" in - y|Y|"") END_LOOP=true - break ;; - *) END_LOOP=false - break ;; - esac - done - - if test "$END_LOOP" = "true" - then - SETTING_NEW_VALUE="$junk" - break - fi - - done - - else - # If it's not a string, it's a fixed list of possible settings - echo -e "\nSelect one of the following:\n" - cnt=1 - - echo " $SETTING_VALUES" - for val in $SETTING_VALUES - do - if test "$val" != "$SETTING_OLD_VALUE" - then - echo -e "\t[$cnt] $val" - else - echo -e "\t[$cnt] $val *" - SETTING_OLD_VALUE_NUM="$cnt" - fi - let cnt=$cnt+1 - done - - echo "" - while true - do - echo -en "Your choice [$SETTING_OLD_VALUE_NUM]: " - read junk - - if test -n "$junk" - then - cnt=1 ; SETTING_NEW_VALUE="" - for val in $SETTING_VALUES - do - if test "$junk" = "$cnt" - then - SETTING_NEW_VALUE="$val" - break - fi - - let cnt=$cnt+1 - done - else - SETTING_NEW_VALUE="$SETTING_OLD_VALUE" - fi - - test -n "$SETTING_NEW_VALUE" && break - done - - fi - - - if test "$SETTING_NEW_VALUE" != "$SETTING_OLD_VALUE" - then - set_pref "$SETTING_NAME" "$SETTING_NEW_VALUE" - echo "Changed $SETTING_NAME to $SETTING_NEW_VALUE" - else - echo "$SETTING_NAME remains unchanged" - fi - echo -e "\n" -} - -build_menu() { - for setting in $TARGETS - do - # SETTING_MENUPOS contains $setting_MENUPOS - SETTING_MENUPOS_="${setting}_MENUPOS" - SETTING_MENUPOS="`eval echo -e \\$${SETTING_MENUPOS_}`" - - # Store all entries in variables named after the menu name - MENU_NAME="SUBMENU_${SETTING_MENUPOS}" - export "${MENU_NAME}"="`eval echo -e \\$${MENU_NAME} ` $setting" - - - echo "$AVAILABLE_MENUES" | grep -q "$SETTING_MENUPOS" || AVAILABLE_MENUES="$SETTING_MENUPOS $AVAILABLE_MENUES" - - done - - #echo "[$AVAILABLE_MENUES]" - - while true - do - echo -e "\nSelect a menu:\n" - cnt=1 - for menu in $AVAILABLE_MENUES Exit - do - MENU_NAME="SUBMENU_$menu" - echo -e "\t[$cnt] $menu" - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Your Choice: " - read junk - - cnt=1 ; GET_MENU="" - for menu in $AVAILABLE_MENUES Exit - do - if test "$cnt" = "$junk" - then - GET_MENU="$menu" - break - fi - let cnt=$cnt+1 - done - - if test "$GET_MENU" = "Exit" - then - EXIT_PROG=true - break - else - EXIT_PROG=false - fi - - if test -n "$GET_MENU" - then - show_menu "$menu" - break - fi - done - test "$EXIT_PROG" = true && break - done -} - -show_menu() { - MENU_NAME="SUBMENU_$1" - - - while true - do - echo -e "\nEntries in this menu:\n" - cnt=1 - for entry in `eval echo -e \\$${MENU_NAME}` Back - do - MENU_NAME_TEXT="${entry}_TEXT" || MENU_NAME_TEXT="${entry}" - - test "$entry" != Back && tmp_="`eval echo -e \\$${MENU_NAME_TEXT}`" || tmp_="Back" - - echo -e "\t[$cnt] $tmp_" - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -en "Your Choice: " - read junk - - cnt=1 ; GET_ENTRY="" - for entry in `eval echo -e \\$${MENU_NAME}` Back - do - if test "$cnt" = "$junk" - then - GET_ENTRY="$entry" - break - fi - let cnt=$cnt+1 - done - - if test "$GET_ENTRY" = "Back" - then - EXIT_MENU=true - break - else - EXIT_MENU=false - fi - - - # At this point the user has selected a menuitem != "Back" - if test -n "$GET_ENTRY" - then - select_config - ask_pref "$GET_ENTRY" - break - fi - done - - test "$EXIT_MENU" = true && break - done -} - -select_config() { - echo -e "\nChange this setting only for the next reboot or permanently?\n" - - echo -e "Select one of the following:\n" - - echo -e "\t[1] Only for the next reboot" - echo -e "\t[2] Permanently" - echo "" - - while true - do - echo -en "Your Choice: " - read junk - - case "$junk" in - 2) CFG="$PERMANENT_CFG" - break ;; - 1) CFG="$TEMPORARY_CFG" - break ;; - esac - done - - # Supress error message about missing config - ! test -e "$CFG" && touch "$CFG" - -} - -go() { - build_menu - - exit 0 - for setting in $TARGETS - do - ask_pref "$setting" - done - -} - - -! test -e "$CFG" && die "[$CFG] not found, exiting" -go diff --git a/packages/altboot/files/altbootctl.conf b/packages/altboot/files/altbootctl.conf deleted file mode 100644 index 13f22b7e91..0000000000 --- a/packages/altboot/files/altbootctl.conf +++ /dev/null @@ -1,98 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: hentges-setup.conf -# Date: 04-Jun-06 - - -TARGETS="REMEMBER_LAST_SELECTION ENABLE_ALTBOOT FSCK_IMAGES TIMEOUT INIT_RUNLEVEL NO_GUI_RL \ - USB_HOST_AVAILABLE USB_NETWORKING_AVAILABLE ASK_PW_ON_BOOT SD_DEVICE SD_KERNEL_MODULE \ - IMAGE_PATH IMAGE_TYPE ENABLE_IMAGECONF USB_STORAGE_MODULES USB_STORAGE_PARTITION \ - USB_STORAGE_WAIT SD_MOUNTPOINT ENABLE_DEBUGGING ENABLE_DEBUG_SHELL ENABLE_SOUND" - - -REMEMBER_LAST_SELECTION_VALUES="yes no" -REMEMBER_LAST_SELECTION_TEXT="Remember the last selected menu item for next boot" -REMEMBER_LAST_SELECTION_MENUPOS="Core" - -ENABLE_ALTBOOT_VALUES="yes no" -ENABLE_ALTBOOT_TEXT="Enable or disable the altboot boot-manager" -ENABLE_ALTBOOT_MENUPOS="Core" - -TIMEOUT_VALUES="" -TIMEOUT_TEXT="Altboot boot-menu timeout in seconds" -TIMEOUT_MENUPOS="Core" - -INIT_RUNLEVEL_VALUES="" -INIT_RUNLEVEL_TEXT="Default runlevel" -INIT_RUNLEVEL_MENUPOS="Core" - -NO_GUI_RL_VALUES="" -NO_GUI_RL_TEXT="GUI-less runlevel" -NO_GUI_RL_MENUPOS="Core" - -ENABLE_DEBUGGING_VALUES="auto yes no" -ENABLE_DEBUGGING_TEXT="Enable debugging output" -ENABLE_DEBUGGING_MENUPOS="Core" - -ENABLE_DEBUG_SHELL_VALUES="yes no" -ENABLE_DEBUG_SHELL_TEXT="Enable a shell prompt after kernel init" -ENABLE_DEBUG_SHELL_MENUPOS="Core" - -ENABLE_SOUND_VALUES="yes no" -ENABLE_SOUND_TEXT="Emmit a beep on boot" -ENABLE_SOUND_MENUPOS="Core" - -FSCK_IMAGES_VALUES="yes no" -FSCK_IMAGES_TEXT="Automatically fsck loop-images" -FSCK_IMAGES_MENUPOS="LoopImages" - -IMAGE_PATH_VALUES="" -IMAGE_PATH_TEXT="Subdirectory for loop-files" -IMAGE_PATH_MENUPOS="LoopImages" - -IMAGE_TYPE_VALUES="" -IMAGE_TYPE_TEXT="Image FS type" -IMAGE_TYPE_MENUPOS="LoopImages" - -ENABLE_IMAGECONF_VALUES="yes no" -ENABLE_IMAGECONF_TEXT="Configure new loop-images on 1st boot" -ENABLE_IMAGECONF_MENUPOS="LoopImages" - -USB_HOST_AVAILABLE_VALUES="yes no" -USB_HOST_AVAILABLE_TEXT="Device supports full USB *HOST* mode" -USB_HOST_AVAILABLE_MENUPOS="USB" - -USB_NETWORKING_AVAILABLE_VALUES="yes no" -USB_NETWORKING_AVAILABLE_TEXT="USB networking is available" -USB_NETWORKING_AVAILABLE_MENUPOS="USB" - -USB_STORAGE_MODULES_VALUES="" -USB_STORAGE_MODULES_TEXT="Kernelmodules required for USB" -USB_STORAGE_MODULES_MENUPOS="USB" - -USB_STORAGE_PARTITION_VALUES="" -USB_STORAGE_PARTITION_TEXT="USB storage device file" -USB_STORAGE_PARTITION_MENUPOS="USB" - -USB_STORAGE_WAIT_VALUES="" -USB_STORAGE_WAIT_TEXT="Wait x seconds before mount USB storage" -USB_STORAGE_WAIT_MENUPOS="USB" - -ASK_PW_ON_BOOT_VALUES="yes no" -ASK_PW_ON_BOOT_TEXT="Alway ask altboot password on boot" -ASK_PW_ON_BOOT_MENUPOS="Core" - -SD_DEVICE_VALUES="" -SD_DEVICE_TEXT="The device-file for the SD card" -SD_DEVICE_MENUPOS="SD_MMC" - -SD_KERNEL_MODULE_VALUES="" -SD_KERNEL_MODULE_TEXT="Kernelmodule required for SD operation" -SD_KERNEL_MODULE_MENUPOS="SD_MMC" - -SD_MOUNTPOINT_VALUES="" -SD_MOUNTPOINT_TEXT="Mointpoint for the SD card" -SD_MOUNTPOINT_MENUPOS="SD_MMC" diff --git a/packages/altboot/files/beep.raw b/packages/altboot/files/beep.raw deleted file mode 100644 index f76112185c..0000000000 --- a/packages/altboot/files/beep.raw +++ /dev/null @@ -1 +0,0 @@ -€~€~~~~€~€~€~€~~€~€~€~€~€~~€€~v…ok›”[l©‘Sp¯ŒMx³‚L‚³xM°nS’ªlT”®gOž°ZQ«©O\´œHj¸ŽFx¸€H…µuM°mR–«gVš¨dXœ¦aZŸ¤^[£¤Z\§¢U^­ Ob³›Jg·”Fo»ŒCx¼ƒC€»{Eˆ¸tIŽ´nM”¯iR—ªfX›¥b]žŸ_b¢š\h¥”Xo¨Vvª…T~«~T…«vUŒ©oX’¥j\—¡g`šœde›—cjœ’božŽasŸ‰_x¡…]|¢€\‚¤{Z‡¥uY¥pZ’¤k[–¢g^šŸcb›afŸ—_j¡“^o¢Ž]t£‰[y¤ƒ[¤~[„¤x\Š£r] l`•hc™™dh•al ^q¢‹]w£†\|£€\£{\†£v]Œ¡q_‘Ÿla•œgeš™chž•`m¡]r£‹[w¤†Z|¥€Z¥{[‡¤v\Œ¢q^Ÿma”œid˜™fhš•dlœbqžŒavŸ‡`{Ÿ‚a€}c…›xe‰™ugŒ—ri•oj’•kk–”flœ’`o¢ŽZt§ˆW{ªUªzV‡¨uXŒ¦qZ£m]“ j`–gcššcg•amŸ_r¡Š^x¢…]|¢€]¢|]…¡x^Š¡s_ŽŸoa’kd–™hh˜•fk™’eo›Žcr‹awŸ†_| €_‚ z`‡žvcŠšvhˆ“yq…Š|y‚‚€~ƒ~|ƒ~}€‚€~~‚~|‚„}{‚„}|‚ƒ}}~€}‚}€‚}€~~‚~|ƒ}|‚‚}~€~€€~€‚}€‚}€€~€€~~‚‚||„ƒz|…ƒz|„ƒ||‚„~z‡}w…‡ty’ƒe¡{Y‰§pY”£fa˜_m¡\w¤„Z~¦Wƒ©zUˆªtUŽ©nW”¦g[›¢a` œ]f¤–Zm¦Ys¦ŠYw¦…X|§W¨|W…¨xW‰§tYŒ¦pZ‘¥j\˜¢c` œ\g¥”Yn§Xu¦ˆZy¥„Z|¥€Z¥|[…£x\‰¢u^Œ¡r^ m_•Ÿga›œbe —]k£’[p¥ŒZu¦‡Y{¦‚Y€¦|Y†¥w[‹£r]¡m_”žib™›efœ—akŸ’^o¢]t£ˆ[y¤ƒ[~¤[ƒ£z\ˆ¢u^Œ¡q`‘žlb•›hf˜˜eiœ”bnž`r ‹^w¢†]|£\£{\†¢v]‹¡r_Ÿma”œhd™™ehœ•am ^r¢‹\w¤…Z}¥€Y‚¦zZˆ¥u[£p]’¡k_–žgcššdg–alŸ‘_q¡‹^v¢†]{¢]¢|^…¡w_Š s`Žžpb‘œme”™jh–•hk˜’fpšet›‰cx…b|€až|a…žxb‰tcœpd‘šlf”˜ii—•flš‘doœbtž‰axž…`}ž€až|b…œxcˆ›ue‹™rf˜nh’•jk—’fo›buž‡a{ž‚a~b‚{b†wcŠ›te™qh–nk’“mm“‘lo”jq–hu—‰lx…u{…ƒ~}…x€ˆw‡~z„~}‚€€€€€€|„z…~{„|€ƒ|ƒ~}‚}~‚~}ƒ}{‚…|zƒ„|{ƒƒ}|‚ƒ}|‚ƒ|{„„{{…„z|…‚{~ƒ}}‚‚~|ƒ~}€‚€}~ƒ€{‚…vy‘†ex¡†Yz©ƒT~«}T…ªvV§nZ”¢h_™žcdž˜_i¢“\n¥Ys¨ŠVwª…T|­€Q‚°zN‰±qN“¯gRœ«_W£¥Z]§ŸWcª™Ui«’Tp«ŒTvª…U}©V‚¨zXˆ¦tZ£p]‘¡l`•hc˜šeg›–ck’aoŸŽ`s ‰_x¡…^}¡€_‚ {_‡ v`ŒŸqamc”›ie—˜fi›”cmž`r ‹^w¢†]|£\£{\‡£v]Œ¡q_Ÿla•œhd™™dhœ•alŸ_q¡‹]v£†\{¤[€¤|[…£w\Š¢s^ n`“žjc—šffš—cj“`o Ž^s¢Š]x£…\}£€\‚£{]†¢v^‹ r`žnc“›jf——giš“dnœbržŠ`wŸ†_| _€ |`…Ÿxa‰žtbœpd‘™lg•–hj˜“fn›cqŒbvž‡azŸƒ`Ÿ~`„Ÿx`Šžsbnd“šjf—˜ghš•dkœ’bnž`r ‹^v¡†^{¡‚^ ~`ƒžzc‡›ve‹˜rh–nk““in˜dqœŒau ˆ^y¡„^}¡€^ |_…Ÿx`‰Ÿsažnb”œheš™chž•`l ‘_q¡Œ^u¡ˆ^y¢…]}£€[‚¤z[ˆ¤t\¡m`”œif–•jn“ŒoxŒƒv€†||…y€‡~y†~z„}‚~~‚~}‚}~ƒ{„{„~{‚ƒ||ƒ‚|~ƒ€{€„{„~{„}{‚„}|ƒƒ|}ƒ{€„|ƒ}}‚‚}}‚~~~~‚~~~€€~‚{~‡v„Œuo”hfœ^b¥Vd¬—Ql¯ŽPu¯…P}®~R„¬wT‹ªqV‘¨kX—¥e\œ¡`a ›]g£–\l¤[r¥‹Yw§†X|¨€V‚©zVˆ¨tW¦oZ“£j]˜ eaœ_e£—Yk¨Ts­‡P|°~O…°vPŒ®rR«pU©nW‘¨lW”¨iX˜¦e[¡`a¡›\h¥“Yp¦‹Xw§…X}¦Yƒ¥yZˆ¤t\¢p^’ ka–œhe™™ehœ•bmž`q Œ^u¢‡]z¢‚]¢~]„¢y^ˆ¡t_Ÿpa‘lc•›hf™—djœ“anŸ_r¡Š^w¢†]|¢]¢|]†¡w_ŠŸranc“šjg——gjš“dnœbsžŠ`wŸ…_| €_ |`†Ÿwa‹žrbœne“™jg—–fkš“cnarŸŠ_w †^{¡‚^€¡}^… x_‰ŸsaŽžoc’›ke•™hh˜•el›‘cpbužˆazŸƒ`~Ÿ~`ƒžyaˆucŒ›pe‘™mg”–ik—“fnšdrœ‹bwž†a{Ÿ`€Ÿ}`…Ÿxa‰žtbpc‘›ld•™if——fiš•dk’aoŸŽ_s¡Š]x¢„]~¢}_…žxc‰šug‹–sj”ql’on‘mq“ks”‹ju–‰hw˜‡fz™ƒh”}p„Šz{…€zƒ…y{ˆ„u{‹ƒu|Š‚w~‡z~…{~„€{€ƒ|€ƒ|€ƒ|€‚~}‚~}‚}}ƒ‚|~„€{€ƒ~}€}€‚}€‚~}~~€€~‚€|„{€„{€„~{ƒ~|‚„}z‚†}xƒˆ|w„ˆ{w„Šzp†–xcˆ¢uZŒ¦qY‘¥k\—¡daœ_f¢–\l¤‘Zq¦ŒXu¨‡Wz¨ƒW~¨Vƒ©yV‰¨rX¦kZ˜£d_Ÿ]e¥–Xm¨Vs©‰Uy«ƒT~«~TƒªyVˆ¨tX¦p[’£k^–Ÿgbš›cf—`k ’^o¢\t£ˆ[z¤ƒ[¤}\„£x]‰¢s^Ž n`“jc—›ff›—cjž“`n ^r¢‹\w¤†[|¥Z€¥|Z…¥x[‰¤s\Ž¢o^’Ÿka–œgdš™dh•alŸ‘_p¡Œ^u¢‡]z¢‚]¢}]„¡x^‰ t`Žžoc’›kf–˜giš”dmœaqŸ‹_v †^{¡]€¢}]…¡x^Š s_Žžnb“œjd—™ghš•cl‘apŸ_t¡ˆ^y¡„]~¢^‚¡z_‡ v`‹žrbœne“™kh––gk™’eo›ŽbsžŠawŸ…`| _€Ÿ|`…Ÿxa‰žtbœpd‘šlg•—ik—’go™Žfs™‹fv™‡eyš„e}›d‚›ze‡™ugŒ–rj“om‘‘mn“jo–gqšŒcu‡azžƒ`ž~a‚{b…xbˆœucŒ›qe™mh”•im˜frš‹cw†a|ž€až{a†vb‹œqd›me•šhfš˜ciž“_o¡_wžƒe€–{nˆŒuxŒ„sŒu‚‰~x†€z~…‚{|„„|zƒ…|zƒ†|yƒ†|y„†{y……z{„ƒ{}ƒ€}€€~€}~ƒ{~„{~„{}„‚{|„ƒ{{„„{z……yz‡„w{‰ƒu}Š€u€Š~w‚‡}{‚‚~~ƒ‚y}ˆv‚‹wrimœ•^j¦”Vn¬Rw¯‚Pƒ¯vQ¬kV™¦b\ŸŸ]c¤˜Yi¨“Vo«ŽSs­ŠQw¯…O}°Nƒ±yO‰¯sQ­lT•©gXš¥d]œ abŸš_h¡”]n£ŽZt¦ˆXz§‚W¨~Wƒ¨zX‡¦wZŠ¤t]¡p_‘žlc–šgg›–bl ]r¤‰Yy§ƒX€¨|W†§wYŠ¥s[Ž£p^ n`“žkb•œhd™šef˜ai •]l¤‘Zp¦Xu§ˆXz§‚Y€¥|[…¢w^‹Ÿramd“™jg—–fkš’což`t¡ˆ\z¤‚Y€§|X†§vX‹¦q[¢m_“ke“˜nkrtŠ‡x}…~|…‚x~‰€u€Šu€‰w€‡z€„|€‚}‚~}‚}}‚‚}}‚‚}}~~~€€€€~€~€~€~€~€~€€~€~€~€~€~€~€~€~€~€€~€~€~€~€~€~~€~€~€~€~~~~€~€€€€€€€€~€~€~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/packages/altboot/files/c7x0/.mtn2git_empty b/packages/altboot/files/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/c7x0/altboot-2.4.cfg b/packages/altboot/files/c7x0/altboot-2.4.cfg deleted file mode 100644 index 557730fa9f..0000000000 --- a/packages/altboot/files/c7x0/altboot-2.4.cfg +++ /dev/null @@ -1,30 +0,0 @@ -# -# Altboot machine configuration for: C7x0 / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.28/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/c7x0/altboot-2.6.cfg b/packages/altboot/files/c7x0/altboot-2.6.cfg deleted file mode 100644 index 8d91602b25..0000000000 --- a/packages/altboot/files/c7x0/altboot-2.6.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# -# Altboot machine configuration for: c7x0 / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/collie/.mtn2git_empty b/packages/altboot/files/collie/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/collie/altboot-2.4.cfg b/packages/altboot/files/collie/altboot-2.4.cfg deleted file mode 100644 index 702902c9d0..0000000000 --- a/packages/altboot/files/collie/altboot-2.4.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# -# Altboot machine configuration for: Collie / Kernel 2.4 -# - -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/fic-gta01/.mtn2git_empty b/packages/altboot/files/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-2.6.cfg b/packages/altboot/files/fic-gta01/altboot-2.6.cfg deleted file mode 100644 index 2ad9406083..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="no" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="s3cmci.ko" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty b/packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-menu/00-Default b/packages/altboot/files/fic-gta01/altboot-menu/00-Default deleted file mode 100644 index 9d29fdae2a..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/00-Default +++ /dev/null @@ -1,14 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - - -run_module() { - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD b/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD deleted file mode 100644 index 3cf49deea5..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD +++ /dev/null @@ -1,32 +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 SD card" - -test "$DISABLE_SD_BOOT" = 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 - - mount_sd - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 4f5c195be2..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,110 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: 40-bootNFS -# Date: 14-Apr-06 - - -M_TITLE="Boot from NFS" - -test "$DISABLE_NFS_BOOT" = 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 - - nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - start_networking "$nfs_host" - - if test -z "$nfs_host" - then - mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" - - fi - - - if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 - then - echo -e "Please select your NFS root:\n" - - cnt=1 - for nfs_mount in $nfs_mountpoints - do - echo -e "\t[$cnt] $nfs_mount" - let cnt=$cnt+1 - done - - echo "" - - while test -z "$selection" - do - stty echo - echo -n "Boot NFS root: " - - if test "$AUTOBOOT" != "yes" - then - read junk < /dev/tty1 - else - if test -e /etc/.altboot-bootNFS-source.last - then - junk="`cat /etc/.altboot-bootNFS-source.last`" - test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" - else - read junk < /dev/tty1 - fi - fi - - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - echo "$junk" > /etc/.altboot-bootNFS-source.last - fi - let cnt=$cnt+1 - done - - done - else - test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!" - selection="$nfs_mounts" - fi - - mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - - if ( mount | grep -q "/media/nfsroot" ) - then - echo "/media/nfsroot already used, tying to umount..." - umount /media/image - losetup -d /dev/loop0 - umount /media/nfsroot || die "umount failed!" - fi - - mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!" - - # Use configured resolv.conf in the pivoted rootfs - #echo -n "Copying resolv.conf..." - #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - - check_target "/media/nfsroot" bootNFS - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot deleted file mode 100644 index 74200d1ec9..0000000000 --- a/packages/altboot/files/init.altboot +++ /dev/null @@ -1,606 +0,0 @@ -#!/bin/sh -# -# altboot provides a simple bootmenu before init is beeing run. -# There are two default menu entries: "Normal boot" and "Single user mode" -# New menu entries can be created be putting files into /etc/altboot-menu. -# - -test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - -CURRENT_ENV="`set`" -VERSION="DEVELOPER SNAPSHOT" - -# Set some defaults in case altboot.cfg is missing -REAL_INIT="/sbin/init.sysvinit" - -# Read default runlevel from inittab -INIT_RUNLEVEL="`cat /etc/inittab | sed -n "/^id\:/s/id\:\([0-9]\)\:.*$/\1/p"`" -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 ( echo "$OUT_TTY" | grep -q "not" ) -then - OUT_TTY="/dev/tty1" - echo "WARNING: Assignment of OUT_TTY failed (2)!" > "$OUT_TTY" -fi - -case "`uname -r`" in -2.6*) ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";; -2.4*) ALTBOOT_CFG_FILE="/etc/altboot-2.4.cfg";; -*) echo "Warning: Unknown kernel [`uname -r`], using kernel 2.6 configuration!" - ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";; -esac - -test -e "$ALTBOOT_CFG_FILE" && . "$ALTBOOT_CFG_FILE" || echo "WARNING: No $ALTBOOT_CFG_FILE found! Check your installation of Altboot!" > "$OUT_TTY" - -if test -e "${ALTBOOT_CFG_FILE}.next-reboot" -then - . "${ALTBOOT_CFG_FILE}.next-reboot" - rm "${ALTBOOT_CFG_FILE}.next-reboot" -fi - -ENABLE_DEBUG="$ENABLE_DEBUGGING" - -C_RED="\033[31m" -C_YELLOW="\033[33m" -C_BLUE="\033[34m" -C_WHITE="\033[37m" -C_RESET="\033[0m" - - -die() { - echo -e "${C_RED}ERROR: $1${C_RESET}" >"$OUT_TTY" - exec $SH_SHELL <"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -debug_shell() { - # VT 2 = Opie, VT 3 = GPE - test -z "$1" && VT=4 || VT=$1 - - echo -e "\033c" > /dev/tty$VT - - echo -en "\nPress to activate the debug shell." > /dev/tty$VT - read junk /dev/tty$VT - /bin/sh /dev/tty$VT 2>&1 - - #openvt -lf -c$VT -- /bin/sh /dev/tty$VT 2>&1 -} - -# This function prints the boot-menu -# $1: Directory containing the scripts for the menu-items -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" - - m_entry="" - - cd $1 - - 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 - # the shell environment / all set variables! - M_TITLE="`. $1/$file title`" - FLAGS="`$1/$file flags`" - - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - #m_entry="`echo -e "$m_entry\n$cnt:$file\n"`" - - set_pref "menu_filelist" "$cnt" "$file" - test -n "$FLAGS" && set_pref "menu_fileflags" "$cnt" "$FLAGS" - echo -e "\t\t[$cnt] $M_TITLE" - fi - M_TITLE="" - fi - done - -# debug_echo "FILES READ" - - # Display directories below /etc/altboot-menu as menu-item - # and add all scripts inside the directory to m_entry - for dir in `ls -1` - do - if test -d "$1/$dir" - then - M_TITLE="`basename "$1/$dir"`" - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - - set_pref "menu_filelist" "$cnt" "$dir:DIR" - - # Set noRemember flag for directories - set_pref "menu_fileflags" "$cnt" "noRemember" - - echo -e "\t\t[$cnt] $M_TITLE" - - OLD_PWD="$PWD" - cd "$1/$dir" - for file in `ls -1` - do - if ! test -d "$1/$dir/$file" - then - M_TITLE="`$1/$dir/$file title`" - FLAGS="`$1/$dir/$file flags`" - - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - - set_pref "menu_filelist" "$cnt" "$dir/$file" - test -n "$FLAGS" && set_pref "menu_fileflags" "$cnt" "$FLAGS" - fi - M_TITLE="" - fi - done - cd "$OLD_PWD" - - else - debug_echo "show_menu(): \$M_TITLE is empty" - fi - M_TITLE="" - fi - done - -# debug_echo "DIRS READ" - - echo "" -} - -# This function is used to display the content of directories below -# /etc/altboot-menu as menu-items -show_sub_menu() { - dirname="`basename "$1"`" - - d_entries="`dump_pref "menu_filelist" | grep "$dirname/"`" - - echo -e "\naltboot v$VERSION: $dirname menu\n" - - for d_entry in $d_entries - do - 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 -e "\t\t[$d_entry_number] $d_entry_title" - done - - echo "" - -} - -get_kbd_ints(){ - if ( uname -r | grep -q ^2.6 ) - then - if test -z "$KBD_INT" - then - # find out how the keyboard is called - for kbd in Spitzkbd corgikbd locomokbd tosakbd "Neo1973 AUX button" - do - if ( cat /proc/interrupts | grep -q "$kbd" ) - then - debug_echo "run_timer(): Using [$kbd] as keyboard interrupt" - KBD_INT="$kbd" - break - fi - done - fi - key_ints="`cat /proc/interrupts | grep "$KBD_INT"`" - #debug_echo "run_timer(): key_ints = [$key_ints]" - else - KBD_INT="$kbd" - debug_echo "\nrun_timer(): Using [keyboard] as keyboard interrupt in kernel-2.4 mode" - key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`" - fi - - test -z "$KBD_INT" && debug_echo "Couldn't read keyboard ints!" -} - -# Shows the timer and sets $launch_altboot to yes if a keypress was detected -run_timer() { - if test "$TIMEOUT" != 0 -a "$TIMEOUT" != "[none]" - then - - mount -t proc proc /proc >/dev/null 2>&1 - - get_kbd_ints - kbd_ints_old="$key_ints" - - #debug_echo "run_timer() old:`echo $key_ints | md5sum`" - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - case "$KBD_INT" in - Neo1973*) echo -en "\n\nPlease press [AUX] to launch altboot." > "$OUT_TTY" ;; - *) echo -en "\n\nPlease press any key to launch altboot." > "$OUT_TTY" ;; - esac - - test -z "$TIMEOUT" && TIMEOUT="3" - - cnt=0 - while test "$cnt" != "$TIMEOUT" - do - sleep 1 - - get_kbd_ints - kbd_ints_new="$key_ints" - - if test "$kbd_ints_new" != "$kbd_ints_old" -o -z "$kbd_ints_new" - then - launch_altboot=yes - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - break - fi - echo -n "." >"$OUT_TTY" - let cnt=$cnt+1 - done - - if test "$launch_altboot" != "yes" - then - AUTOBOOT=yes - else - rm -f /etc/.altboot*.last - fi - - 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 -parse_module_flags() { - if test -n "$1" - then - # Each module can set "flags" to influence handling of the module - get_pref "menu_fileflags" "$1" flags - - test -n "$flags" && debug_echo "parse_module_flags(): [$1] has flags [$flags]" - - for flag in $flags - do - case "$flag" in - noRemember) REMEMBER_LAST_SELECTION=no;; - esac - done - else - debug_echo "parse_module_flags(): Empty \$1" - fi -} - -# This function launches the selected menu item / script -# $1: Directory containing the scripts for the menu-items -launch_selection() { - test -z "$1" && die "Parameter 1 of launch_selection is empty!" - - case "$junk" in - *) #file="`echo "$m_entry"| sed -n "/$junk\:/s/^.*\:\(.*\)/\1/p"`" - - get_pref "menu_filelist" "$junk" file_ - type="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\2/p"`" - file="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\1/p"`" - test -z "$file" && file="$file_" - -# debug_echo "[$file_]: [$type] : [$flags] / [$file] ($junk)" - - # The selected menu-item points to a directory - if test "$type" = DIR - then - show_sub_menu /etc/altboot-menu/$file >"$OUT_TTY" - wait_for_input >"$OUT_TTY" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - if test "$type" = MAIN - then - show_sub_menu /etc/altboot-menu >"$OUT_TTY" - wait_for_input >"$OUT_TTY" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - - - . $1/$file run "$file" >"$OUT_TTY" - die "WARNING: Using failsafe shell" >"$OUT_TTY" - - ;; - esac -} - - -wait_for_input() { - - # Neo has only two buttons: AUX and PWR. - # Only AUX is easily readable from userspace, so are touchscreen taps - if test "$KBD_INT" = "Neo1973 AUX button" - then - ints_old="`cat /proc/interrupts | grep "$KBD_INT" | awk '{print $2}'`" - ts_ints_old="`cat /proc/interrupts |grep action| tail -1 | awk '{print $2}'`" - - echo "Please press [AUX] to set a menu number" <"$OUT_TTY" > "$OUT_TTY" 2>&1 - echo -e "Press the touchscreen to start\n" - - x="$last_selection" ; hold_events=0 - - echo -n "Your Choice: [$x / $cnt]" - - while true - do - - ts_ints_now="`cat /proc/interrupts |grep action| tail -1 | awk '{print $2}'`" - - if test "$ts_ints_now" = "$ts_ints_old" - then - ints_now="`cat /proc/interrupts | grep "$KBD_INT" | awk '{print $2}'`" - - if test "$ints_now" -gt "$ints_old" - then - # Only react on every second interupt as both PRESS and RELEASE generate - # one. - if test -n "$tmp" - then - #debug_echo "wait_for_input(): PRESS/RELEASE EVENT [$ints_now <-> $ints_old]" - - MAX_ENTRIES="$cnt" - - test "$x" = "$cnt" && x=1 || let x=$x+1 - - #\r : go to beginning of the current line - #\033[K : completely clear the current line - echo -en "\r\033[KYour Choice: [$x / $cnt]" - - - tmp="" - else - tmp=blahh - fi - fi - - ints_old="$ints_now" - else -# debug_echo "wait_for_input(): TOUCHSCREEN EVENT [$ts_ints_now <-> $ts_ints_old]" - ts_ints_old="$ts_ints_now" - - parse_module_flags "$x" - - if test "$REMEMBER_LAST_SELECTION" != no - then - # Don't remount rw if the drive is already mounted rw - # Only helpful for testing / debugging - if test "`mount|sed -n "/\/dev\/root/s/.*(\(.*\))/\1/p"`" != "rw" - then - mount -o remount,rw / >/dev/null 2>&1 - echo "$x" > /etc/altboot.conf - mount -o remount,ro / >/dev/null 2>&1 - else - echo "$x" > /etc/altboot.conf - fi - fi - - junk="$x" - break - - fi - done - else - while true - do - - # Do _not_ change the next few lines! - # - # This is required to work around an annoying busybox bug. - # Every key you press while this script runs will be - # picked up by the next "read $junk". - # So the next read would pick up the "any" key the user pressed - # above to launch the altboot menu. - - - # Bash throws an ugly error on kill - if ! (readlink /bin/sh | grep -q bash) - then - # This filters an "" from the user as "any key" - ( while :; do read x< "$OUT_TTY" 2>&1; done; ) > /dev/null 2>&1 & - sleep 1; kill $! >/dev/null 2>&1 - fi - - echo -n "Please choose one of the above [$last_selection]: " <"$OUT_TTY" > "$OUT_TTY" 2>&1 - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk< "$OUT_TTY" 2>&1 - - # This filters other chars the user may have used - - junk="`echo "$junk" | sed "s/[a-zA-Z]//g"`" - - if test "$junk" -lt "$cnt" -o "$junk" -eq "$cnt" - then - if test ! -z "$junk" - then - parse_module_flags "$junk" - - if test "$REMEMBER_LAST_SELECTION" != no - then - # Don't remount rw if the drive is already mounted rw - # Only helpful for testing / debugging - if test "`mount|sed -n "/\/dev\/root/s/.*(\(.*\))/\1/p"`" != "rw" - then - mount -o remount,rw / >/dev/null 2>&1 - echo "$junk" > /etc/altboot.conf - mount -o remount,ro / >/dev/null 2>&1 - else - echo "$junk" > /etc/altboot.conf - fi - fi - else - junk="$last_selection" - parse_module_flags "$junk" - break - fi - break - fi - done - fi -} - -# * * * * * * This is the main function * * * * * * - -if ( echo "$VERSION" | egrep -iq "(snapshot|-rc)" ) -then - if test "$ENABLE_DEBUGGING" = "auto" -o -z "$ENABLE_DEBUGGING" - then - ENABLE_DEBUG="yes" - fi -fi - -test "$ENABLE_DEBUG_SHELL" = "yes" && debug_shell 4 >/dev/null 2>&1 & - -if test "$ENABLE_DEBUGGING" = "yes" -then - ENABLE_DEBUG="yes" - debug_shell 4 >/dev/null 2>&1 & -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" -# - -mount | grep -q "^/proc" || mount -t proc proc /proc -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" - -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 "`basename "$0"`" = "altboot" -then - show_menu /etc/altboot-menu - exit 0 -fi - -if test "$user_called" = "1" -then - 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 -else - # Boot original init if altboot is turned off - if test "$ENABLE_ALTBOOT" != "yes" - then - echo "altboot: Using real init [$REAL_INIT] **" >"$OUT_TTY" - exec $REAL_INIT $INIT_RUNLEVEL - exit 0 - fi - - # Execute scripts in /etc/altboot.rc before doing anything else. - # Required in special situations, like booting spitz - RC_FILES=`ls /etc/altboot.rc | grep \.sh$` - - for file in $RC_FILES - do - . /etc/altboot.rc/$file >"$OUT_TTY" 2>&1 || echo "/etc/altboot.rc/$file failed!" - done - - # Make sure altboots master password is set - set_password >"$OUT_TTY" - - test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >"$OUT_TTY" - - # When started with -force, always print the menu - echo "$*" | grep -q -- "-force" && TIMEOUT=0 - - # This timeout works by reading /proc/interrupts to see if the keyboard interrupt - # increases while the timer is running. A TIMEOUT of 0 will always launch altboot. - run_timer >"$OUT_TTY" - - echo "" >"$OUT_TTY" - - # launch_altboot is set to "yes" by run_timer when the user presses the button during the timeout - if test "$launch_altboot" != yes - then - # last_selection is the previously selected menu item by the user - last_selection="`cat /etc/altboot.conf`" >/dev/null 2>&1 - test -z "$last_selection" && last_selection="1" - - 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 2>&1 - - junk="$last_selection" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - # Anything after this point will never be reached if $launch_altboot != yes - - # Show the altboot menu - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - show_menu /etc/altboot-menu >"$OUT_TTY" - - # Load last selection for use as default if is pressed at the prompt - last_selection="`cat /etc/altboot.conf`" >/dev/null 2>&1 - test -z "$last_selection" && last_selection="1" - - # Ask the user which menu-item to use - wait_for_input >"$OUT_TTY" - - # This should _never_ happen. - if test -z "$junk" - then - echo "WARNING: Trying failsafe mode" >"$OUT_TTY" - mount -o remount,rw / >"$OUT_TTY" 2>&1 - echo "Dumping environment to /altboot.env" - echo "$CURRENT_ENV" > /altboot.env - mount -o remount,ro / >"$OUT_TTY" 2>&1 - junk=1 - fi - - launch_selection /etc/altboot-menu >"$OUT_TTY" - - # Uhoh, something went terribly wrong if we reach this point! - die "WARNING: Failsafe fall-through activated. Spawning emergency shell" - -fi - - diff --git a/packages/altboot/files/nslu2le/.mtn2git_empty b/packages/altboot/files/nslu2le/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-2.6.cfg b/packages/altboot/files/nslu2le/altboot-2.6.cfg deleted file mode 100644 index 626c543085..0000000000 --- a/packages/altboot/files/nslu2le/altboot-2.6.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# -# Altboot machine configuration for: NSLU2 / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" - -# If set to "0" the menu will always be shown, if set to -# "[none]" there will be no menu and no delay -TIMEOUT="[none]" - -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="no" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - - -# Can't do that due to missing console -ENABLE_IMAGECONF="no" - -SD_DEVICE="" -SD_KERNEL_MODULE="" - - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="no" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -INIT_RUNLEVEL="3" -NO_GUI_RL="" - -# The if set to "", altboot will force you to set a master password on -# first-boot -MASTER_PASSWORD="[none]" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -DISABLE_SD_BOOT="yes" -DISABLE_CF_BOOT="yes" -DISABLE_NOGUI_BOOT="yes" -DISABLE_BINSH_BOOT="yes" -DISABLE_INSTTGZ_BOOT="yes" diff --git a/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage b/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage deleted file mode 100644 index 50d35ed542..0000000000 --- a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# NOTE: Ported to altboot by CoreDump -# Based on the original turnup helper script. -# -# All parts by Matthias 'CoreDump' Hentges are hereby placed -# under the terms of the GPL -# -# boot from the hard disk partition "$1" (which -# must be given) using options from the rest of -# the command line. -# - -M_TITLE="Boot USB Storage" -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -run_module() { - x=x -} - -case "$1" in -title) echo "$M_TITLE" ; exit 0 ;; -run) run_module "$2";; -esac - -nslu2_feeback heartbeat - -bootdev_data="$*" -bootdev_mode="`echo "$bootdev_data" | awk '{print $1}'`" -bootdev_name="`echo "$bootdev_data" | awk '{print $2}'`" -bootdev_uuid="`echo "$bootdev_data" | awk '{print $3}'`" - - -# 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 -# -leds boot system -# -if test -n "$1" -then - device="$bootdev_name" - UUID="$bootdev_uuid" - - shift - # proc is needed for UUID mount and module load - mount -t proc proc /proc - # load USB & SCSI storage modules (/proc required!) - echo "boot: loading modules required for disk boot" - loaddiskmods - # waiting for disk (FIXME) - sleep=6 - test "$sleep" -gt 0 && sleep "$sleep" - # - # 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 - # 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 -nslu2_feeback failure -exec /boot/flash diff --git a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash b/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash deleted file mode 100644 index 394279c2af..0000000000 --- a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2007 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: 10-Onboard-Flash -# Date: 20070218 (YMD) - -leds beep -. /etc/default/functions -leds boot system -test -x /sbin/init && exec /sbin/init -# fallback if /sbin/init has been deleted (bad!) -leds boot system panic -exec <>/dev/console >&0 2>&0 -test -x /sbin/sulogin && exec /sbin/sulogin -test -x /bin/sh && exec /bin/sh -exit 1 diff --git a/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-menu/00-Default b/packages/altboot/files/nslu2le/altboot-menu/00-Default deleted file mode 100644 index cb06661d72..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/00-Default +++ /dev/null @@ -1,17 +0,0 @@ -# !/bin/sh -M_TITLE="Flash" - - -run_module() { - leds beep - leds boot system - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -*) echo "Unknown parameter [$1]";; -esac - diff --git a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick b/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick deleted file mode 100644 index c6c215ecc4..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick +++ /dev/null @@ -1,174 +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="USB Attached 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 -e "\nStarting 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 "" - scan_devices - usb_show_menu - -# 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 -} - -scan_devices() { - reset_pref "available_devices" - - cnt=1 - - for scsi_disk in `ls -1 /sys/block/ | grep ^sd` - do - scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" - test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" - test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" - - test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" - test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" - - scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" - test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" - - set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" - set_pref "available_devices_short" "$cnt" "$scsi_disk" - set_pref "available_devices_type" "$cnt" "usb" - - let cnt=$cnt+1 - done - -} - -usb_show_menu() { - - cnt2=0 ; let cnt=$cnt-1 - while test "$cnt" != "$cnt2" - do - let cnt2=$cnt2+1 - get_pref "available_devices" "$cnt2" dev - - echo -e "\t[$cnt2] - $dev" - done - - while test -z "$selected_dev" - do - echo -en "\nYour choice: " - read junk - get_pref "available_devices" "$junk" selected_dev - get_pref "available_devices_type" "$junk" part_mode - -# debug_echo "show_menu(): selected: [$selected_dev]" - done - - if ( echo "$selected_dev" | grep -q "^Flash" ) - then - boot_from flash - else - get_pref "available_devices_short" "$junk" selected_dev -# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" - - partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" - test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" - - - echo -e "\nPlease select a partition on $selected_dev to boot from:\n" - - cnt=1 - for partition in $partitions - do - # We assume that partitions with a "size" < 10 are extended partitions - # and should not be listed. TYPE=swap is blacklisted as well. - part_size="`cat /sys/block/$selected_dev/$partition/size`" - part_type="`blkid -s TYPE -o value /dev/$partition`" - - if test "$part_size" -gt 10 -a "$part_type" != "swap" - then - let part_size="($part_size/2)/1000" - echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" - set_pref "available_partitions" "$cnt" "$partition" - - let cnt=$cnt+1 - fi - done - - while test -z "$selected_partition" - do - echo -en "\nYour choice: " - read junk - get_pref "available_partitions" "$junk" selected_partition - done - - part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" - - boot_from "$part_mode" "$selected_partition" "$part_uuid" - fi -} - -boot_from() { - debug_echo "boot_from() [$*]" - - part_mode="$1" - part_name="$2" - part_uuid="$3" - - case "$part_mode" in - usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 - rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev - - if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) - then - echo "** Note: UUID mount for $part_name failed" - mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" - fi - - if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit - then - copy_rootfs /tmp/mnt.set-bootdev/ - else - umount /tmp/mnt.set-bootdev - echo -e "\nSetting /dev/$part_name as boot-partition" - echo "3 $part_name $part_uuid" > /etc/altboot.last - fi - ;; - esac -} - -copy_rootfs() { - debug_echo "copy_rootfs() [$*]" -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh b/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh deleted file mode 100644 index 1c3fccd9d9..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh +++ /dev/null @@ -1,27 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - -test "$DISABLE_BINSH_BOOT" = yes && exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >$OUT_TTY - - # Mount /proc, etc - init_rootfs - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL <$OUT_TTY >$OUT_TTY 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/poodle/.mtn2git_empty b/packages/altboot/files/poodle/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/poodle/altboot-2.4.cfg b/packages/altboot/files/poodle/altboot-2.4.cfg deleted file mode 100644 index 1bce54015c..0000000000 --- a/packages/altboot/files/poodle/altboot-2.4.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# -# Altboot machine configuration for: Poodle / Kernel 2.4 -# - -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="no" -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -ENABLE_IMAGECONF="yes" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg deleted file mode 100644 index f867db6b05..0000000000 --- a/packages/altboot/files/poodle/altboot-2.6.cfg +++ /dev/null @@ -1,45 +0,0 @@ -# -# Altboot machine configuration for: Poodle / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="no" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -# Poodle already boots off SD natively! -DISABLE_SD_BOOT="yes" - diff --git a/packages/altboot/files/set-bootdev b/packages/altboot/files/set-bootdev deleted file mode 100755 index 60d0283dc4..0000000000 --- a/packages/altboot/files/set-bootdev +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/sh - -VERSION="0.0.1" -ENABLE_DEBUG="yes" - -die() { - echo -e "ERROR: $1" - exit 1 -} - -. /etc/altboot.func || die "/etc/altboot.func is missing!" -test -d /sys/block || die "Sysfs problem? (/sys/block not found)" - -debug_echo() { - test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" -} - -scan_devices() { - reset_pref "available_devices" - - cnt=1 - set_pref "available_devices" "$cnt" "Flash" ; let cnt=$cnt+1 - - for scsi_disk in `ls -1 /sys/block/ | grep ^sd` - do - scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" - test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" - test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" - - test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" - test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" - - scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" - test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" - - set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" - set_pref "available_devices_short" "$cnt" "$scsi_disk" - set_pref "available_devices_type" "$cnt" "usb" - - let cnt=$cnt+1 - done - -} - -show_menu() { - echo -e "\nset-bootdev v$VERSION\n" - - echo -e "Please select the device you wish to boot from:\n" - - cnt2=0 ; let cnt=$cnt-1 - while test "$cnt" != "$cnt2" - do - let cnt2=$cnt2+1 - get_pref "available_devices" "$cnt2" dev - - echo -e "\t[$cnt2] - $dev" - done - - while test -z "$selected_dev" - do - echo -en "\nYour choice: " - read junk - get_pref "available_devices" "$junk" selected_dev - get_pref "available_devices_type" "$junk" part_mode - -# debug_echo "show_menu(): selected: [$selected_dev]" - done - - if ( echo "$selected_dev" | grep -q "^Flash" ) - then - boot_from flash - else - get_pref "available_devices_short" "$junk" selected_dev -# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" - - partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" - test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" - - - echo -e "\nPlease select a partition on $selected_dev to boot from:\n" - - cnt=1 - for partition in $partitions - do - # We assume that partitions with a "size" < 10 are extended partitions - # and should not be listed. TYPE=swap is blacklisted as well. - part_size="`cat /sys/block/$selected_dev/$partition/size`" - part_type="`blkid -s TYPE -o value /dev/$partition`" - - if test "$part_size" -gt 10 -a "$part_type" != "swap" - then - let part_size="($part_size/2)/1000" - echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" - set_pref "available_partitions" "$cnt" "$partition" - - let cnt=$cnt+1 - fi - done - - while test -z "$selected_partition" - do - echo -en "\nYour choice: " - read junk - get_pref "available_partitions" "$junk" selected_partition - done - - part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" - - boot_from "$part_mode" "$selected_partition" "$part_uuid" - fi -} - -boot_from() { - debug_echo "boot_from() [$*]" - - part_mode="$1" - part_name="$2" - part_uuid="$3" - - case "$part_mode" in - usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 - rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev - - if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) - then - echo "** Note: UUID mount for $part_name failed" - mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" - fi - - if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit - then - copy_rootfs /tmp/mnt.set-bootdev/ - else - umount /tmp/mnt.set-bootdev - echo -e "\nSetting /dev/$part_name as boot-partition" - echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf - fi - ;; - flash) echo "Setting the onboard flash as boot-partition" - echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf - ;; - esac -} - -copy_rootfs() { - debug_echo "copy_rootfs() [$*]" -} - -scan_devices -show_menu diff --git a/packages/altboot/files/spitz/.mtn2git_empty b/packages/altboot/files/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/spitz/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg deleted file mode 100644 index 0a2b643b76..0000000000 --- a/packages/altboot/files/spitz/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Spitz / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="no" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/tosa/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg deleted file mode 100644 index f84e2d57b9..0000000000 --- a/packages/altboot/files/tosa/altboot-2.4.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# -# Altboot machine configuration for: Tosa / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/tosa/altboot-2.6.cfg b/packages/altboot/files/tosa/altboot-2.6.cfg deleted file mode 100644 index 62e8ea2434..0000000000 --- a/packages/altboot/files/tosa/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" -- cgit v1.2.3 From 022ee23989dcc00839c08cd50c674a428180d0d6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Mar 2007 08:55:18 +0000 Subject: linux-handhelds-2.6: Drop 2.6.20-hh2. Add 2.6.20-hh4. * Changes since 2.6.20-hh3: 1. htcathena port added. 2. Generic Device GPIO API (aka gpiodev) committed, based on virtual device methods pattern. 3. rs232_serial - generic driver for GPIO-controlled RS232 transceiver on serial port. 4. hx4700_serial, h4000_serial: Superceded by rs232_serial, removed. Last release available is 2.6.20-hh3. 5. pxa2xx-udc-gpio - generic driver to control UDC on PXA-based machine using Device GPIOs. 6. h4000: Added separate mach_type for h4300, to solve (rather move out of kernel) issues with h4300 keyboard support. Now, h43000_kbd can be safely built into the kernel - it will load only for MACH_H4300. 7. h4000: codebase cleanup. 8. ds2760_battery: remove APM code, realy on apm_power to do APM reporting. 9. h5000: Added ASoC support, ak4535 ASoC codec fixed. --- packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb | 11 ----------- packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb create mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb deleted file mode 100644 index b34d4630a0..0000000000 --- a/packages/linux/linux-handhelds-2.6_2.6.20-hh2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" - -require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh4.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc -- cgit v1.2.3 From c046128ccc358561c39983ae99f4efacadbd27cc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Mar 2007 08:56:45 +0000 Subject: linux-handhelds-2.6: Drop 2.6.20-hh1. Add 2.6.20-hh5. * Changes since 2.6.20-hh4: 1. ts-adc-debounce: Use spec-originated formula for pressure calculation, still needs tweaking for real world; implement pressure cut off properly, and handle jitter in more sustainable manner: now samples with too much jitter are ignored, not cause TS sampling to abort. Still needs further elaboration to solve all outstanding issues and be able to support different machines well. 2. Anton Vorontsov's ADC classdev refactor merged, all ADC API clients are converted to it. 3. h5000: ADC/TS handling rewrote using ADC classdev. Light sensor support added. 4. htcuniversal: tweak keys/switches handling and preliminary code to handle PXA27x LCD controller features. 5. nand_base: Handle OOB operations more robustly. 6. ds1wm: Optmizations and more adherance to specs. --- packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb | 11 ----------- packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb create mode 100644 packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb deleted file mode 100644 index b34d4630a0..0000000000 --- a/packages/linux/linux-handhelds-2.6_2.6.20-hh1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" - -require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh5.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc -- cgit v1.2.3 From d0848d856d6c32ef7bb5007d2d2a4fa192e324ef Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Mar 2007 08:58:49 +0000 Subject: linux-handhelds-2.6 cvs: HEAD is 2.6.20-hh5 now. --- packages/linux/linux-handhelds-2.6_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index ef60a0f9a9..d6ab646606 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "20" -HHV = "3" +HHV = "5" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" -- cgit v1.2.3 From 4ec046d48fc48f679fb40f570e2ce967197b2155 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 09:03:21 +0000 Subject: task-angstrom-x11: add keylaunch --- packages/angstrom/task-angstrom-x11.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 490955af9c..f427f15ab8 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r29" +PR = "r30" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -75,6 +75,7 @@ RDEPENDS_angstrom-gpe-task-settings := "\ gpe-package \ gpe-shield \ gpe-taskmanager \ + keylaunch \ minilite \ minimix \ xmonobut" -- cgit v1.2.3 From 29ecffc666e166906ccaa73f65c2e12ea17a1769 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 09:14:24 +0000 Subject: gpe-conf: fix for http://bugs.linuxtogo.org/show_bug.cgi?id=42 by Manuel Teira --- packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty | 0 packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch | 11 +++++++++++ packages/gpe-conf/gpe-conf_0.2.5.bb | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty create mode 100644 packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch diff --git a/packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty b/packages/gpe-conf/gpe-conf-0.2.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch b/packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch new file mode 100644 index 0000000000..7a953c25ec --- /dev/null +++ b/packages/gpe-conf/gpe-conf-0.2.5/backlight-bugfix.patch @@ -0,0 +1,11 @@ +--- gpe-conf-0.2.5/modules/screen/brightness.c~brightness ++++ gpe-conf-0.2.5/modules/screen/brightness.c +@@ -216,7 +216,7 @@ + FILE *f_power; + gint value = SYS_STATE_ON; + +- f_power = fopen(SYS_BRIGHTNESS, "r"); ++ f_power = fopen(SYS_POWER, "r"); + if (f_power != NULL) + { + fscanf(f_power,"%i", &value); diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb index eff9f55033..6cbddeedd0 100644 --- a/packages/gpe-conf/gpe-conf_0.2.5.bb +++ b/packages/gpe-conf/gpe-conf_0.2.5.bb @@ -10,7 +10,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf" RPROVIDES_${PN} += " bl" RCONFLICTS_${PN} = "bl" -PR = "r1" +PR = "r2" GPE_TARBALL_SUFFIX = "bz2" @@ -22,3 +22,5 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ ${datadir}/gpe-conf" FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + +SRC_URI += "file://backlight-bugfix.patch;patch=1" -- cgit v1.2.3 From 5b092eca308028230d8e65384c2eeef3652e25a9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 10:10:26 +0000 Subject: xserver-kdrive: clean up different patch versions, drop imageon from 1.2 for now --- .../xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty | 0 .../disable-xf86-dga-xorgcfg.patch | 39 ++++++++++++++++++++++ .../xserver-kdrive-1.2/enable-epson.patch | 11 ++++++ .../xserver-kdrive-1.2/enable-tslib.patch | 28 ++++++++++++++++ .../xserver-kdrive-1.2/enable-xcalibrate.patch | 24 +++++++++++++ packages/xorg-xserver/xserver-kdrive-common.inc | 3 ++ .../xserver-kdrive/build-fix-panoramix.patch | 18 ++++++++++ .../disable-xf86-dga-xorgcfg-1.2.patch | 39 ---------------------- .../xserver-kdrive/enable-epson-1.2.patch | 11 ------ packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 11 ++---- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 3 -- 11 files changed, 125 insertions(+), 62 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch new file mode 100644 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch @@ -0,0 +1,11 @@ +Index: xorg-server-1.2.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 +@@ -1,5 +1,5 @@ + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch new file mode 100644 index 0000000000..1e72a3ea53 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch @@ -0,0 +1,28 @@ +Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 +@@ -6,6 +6,10 @@ + + bin_PROGRAMS = Xfbdev + ++if TSLIB ++TSLIB_FLAG = -lts ++endif ++ + libfbdev_a_SOURCES = \ + fbdev.c \ + fbdev.h +@@ -16,7 +20,10 @@ + Xfbdev_LDADD = \ + libfbdev.a \ + @KDRIVE_LIBS@ \ +- @XSERVER_LIBS@ ++ @XSERVER_LIBS@ \ ++ $(TSLIB_FLAG) + + Xfbdev_DEPENDENCIES = \ +- libfbdev.a ++ libfbdev.a \ ++ @KDRIVE_LIBS@ ++ diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch new file mode 100644 index 0000000000..aec94a3a6d --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch @@ -0,0 +1,24 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 +@@ -372,6 +372,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -663,6 +666,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 3cb038648e..72c2a87b32 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -96,7 +96,10 @@ KDRIVE_COMMON_PATCHES = " \ file://kdrive-use-evdev.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ file://kmode-palm.patch;patch=1 \ " diff --git a/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch new file mode 100644 index 0000000000..f919b48f0e --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch @@ -0,0 +1,18 @@ +Index: git/composite/compext.c +=================================================================== +--- git.orig/composite/compext.c 2007-03-28 16:25:12.000000000 +0200 ++++ git/composite/compext.c 2007-03-28 16:25:15.000000000 +0200 +@@ -696,11 +696,13 @@ + if (GetPictureScreenIfSet(pScreen) == NULL) + return; + } ++#ifdef PANORAMIX + /* Xinerama's rewriting of window drawing before Composite gets to it + * breaks Composite. + */ + if (!noPanoramiXExtension) + return; ++#endif + + CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow); + if (!CompositeClientWindowType) diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch deleted file mode 100644 index 4b7e41e3e9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 -+++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 -@@ -513,7 +513,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test "$KDRIVE" = yes; then -+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" -+else - REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" -+fi - REQUIRED_LIBS="xfont xau fontenc" - - AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -@@ -1540,7 +1544,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x"$KDRIVE" = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -@@ -1560,10 +1566,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! "x$KDRIVE" = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch deleted file mode 100644 index 8ec3a37c78..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: xorg-server-1.2.0/hw/kdrive/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 -@@ -1,5 +1,5 @@ - if KDRIVEFBDEV --FBDEV_SUBDIRS = fbdev -+FBDEV_SUBDIRS = fbdev epson - endif - - if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index ac276a8e60..d4c01f240a 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,19 +3,12 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r1" - -PACKAGES =+ "xserver-kdrive-imageon" +PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://enable-epson-1.2.patch;patch=1 \ - file://kdrive-vidmemarea.patch;patch=1 \ - file://kdrive-imageon.patch;patch=1 \ + file://enable-xcalibrate.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" -IMAGEON_OECONF = "--disable-imageon" -IMAGEON_OECONF_arm = "--enable-imageon" diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 1aff9cdf79..3f97527553 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -8,10 +8,7 @@ PACKAGES =+ "xserver-kdrive-w100" SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://xcalibrate.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ file://w100.patch;patch=1 \ " -- cgit v1.2.3 From dcb7c19ada78eaebd5831dc3c07107e136ce3f35 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 10:18:26 +0000 Subject: xserver-kdrive: fix patch directory name for 1.2 --- .../xserver-kdrive-1.2.0/.mtn2git_empty | 0 .../disable-xf86-dga-xorgcfg.patch | 39 ++++++++++++++++++++++ .../xserver-kdrive-1.2.0/enable-epson.patch | 11 ++++++ .../xserver-kdrive-1.2.0/enable-tslib.patch | 28 ++++++++++++++++ .../xserver-kdrive-1.2.0/enable-xcalibrate.patch | 24 +++++++++++++ .../xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty | 0 .../disable-xf86-dga-xorgcfg.patch | 39 ---------------------- .../xserver-kdrive-1.2/enable-epson.patch | 11 ------ .../xserver-kdrive-1.2/enable-tslib.patch | 28 ---------------- .../xserver-kdrive-1.2/enable-xcalibrate.patch | 24 ------------- 10 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch new file mode 100644 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch @@ -0,0 +1,11 @@ +Index: xorg-server-1.2.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 +@@ -1,5 +1,5 @@ + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch new file mode 100644 index 0000000000..1e72a3ea53 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -0,0 +1,28 @@ +Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 +@@ -6,6 +6,10 @@ + + bin_PROGRAMS = Xfbdev + ++if TSLIB ++TSLIB_FLAG = -lts ++endif ++ + libfbdev_a_SOURCES = \ + fbdev.c \ + fbdev.h +@@ -16,7 +20,10 @@ + Xfbdev_LDADD = \ + libfbdev.a \ + @KDRIVE_LIBS@ \ +- @XSERVER_LIBS@ ++ @XSERVER_LIBS@ \ ++ $(TSLIB_FLAG) + + Xfbdev_DEPENDENCIES = \ +- libfbdev.a ++ libfbdev.a \ ++ @KDRIVE_LIBS@ ++ diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch new file mode 100644 index 0000000000..aec94a3a6d --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch @@ -0,0 +1,24 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 +@@ -372,6 +372,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -663,6 +666,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch deleted file mode 100644 index 4b7e41e3e9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 -+++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 -@@ -513,7 +513,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test "$KDRIVE" = yes; then -+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" -+else - REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" -+fi - REQUIRED_LIBS="xfont xau fontenc" - - AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -@@ -1540,7 +1544,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x"$KDRIVE" = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -@@ -1560,10 +1566,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! "x$KDRIVE" = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch deleted file mode 100644 index 8ec3a37c78..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: xorg-server-1.2.0/hw/kdrive/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 -@@ -1,5 +1,5 @@ - if KDRIVEFBDEV --FBDEV_SUBDIRS = fbdev -+FBDEV_SUBDIRS = fbdev epson - endif - - if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch deleted file mode 100644 index 1e72a3ea53..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 -@@ -6,6 +6,10 @@ - - bin_PROGRAMS = Xfbdev - -+if TSLIB -+TSLIB_FLAG = -lts -+endif -+ - libfbdev_a_SOURCES = \ - fbdev.c \ - fbdev.h -@@ -16,7 +20,10 @@ - Xfbdev_LDADD = \ - libfbdev.a \ - @KDRIVE_LIBS@ \ -- @XSERVER_LIBS@ -+ @XSERVER_LIBS@ \ -+ $(TSLIB_FLAG) - - Xfbdev_DEPENDENCIES = \ -- libfbdev.a -+ libfbdev.a \ -+ @KDRIVE_LIBS@ -+ diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch deleted file mode 100644 index aec94a3a6d..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: xorg-server-1.2.0/mi/miinitext.c -=================================================================== ---- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 -+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 -@@ -372,6 +372,9 @@ - #ifdef DMXEXT - extern void DMXExtensionInit(INITARGS); - #endif -+#ifdef XCALIBRATE -+extern void XCalibrateExtensionInit(INITARGS); -+#endif - #ifdef XEVIE - extern void XevieExtensionInit(INITARGS); - #endif -@@ -663,6 +666,9 @@ - #ifdef DAMAGE - if (!noDamageExtension) DamageExtensionInit(); - #endif -+#ifdef XCALIBRATE -+ XCalibrateExtensionInit (); -+#endif - } - - void -- cgit v1.2.3 From 0f58092c991ced1629b1b30bd08e2ea823d46c8d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 11:36:39 +0000 Subject: xserver-kdrive-1.2: fix enable-tslib.patch --- .../xserver-kdrive-1.2.0/enable-tslib.patch | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch index 1e72a3ea53..615f27a7c1 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -13,7 +13,7 @@ Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am libfbdev_a_SOURCES = \ fbdev.c \ fbdev.h -@@ -16,7 +20,10 @@ +@@ -16,7 +20,8 @@ Xfbdev_LDADD = \ libfbdev.a \ @KDRIVE_LIBS@ \ @@ -22,7 +22,16 @@ Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am + $(TSLIB_FLAG) Xfbdev_DEPENDENCIES = \ -- libfbdev.a -+ libfbdev.a \ -+ @KDRIVE_LIBS@ -+ + libfbdev.a +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-29 13:28:35.000000000 +0200 +@@ -1517,6 +1517,7 @@ + AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/]) + fi + AC_DEFINE(TSLIB, 1, [Have tslib support]) ++ AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support]) + fi + + # damage shadow extension glx (NOTYET) fb mi -- cgit v1.2.3 From edc40a59a0f44223deacd1291e5e80b7b9360897 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 29 Mar 2007 11:56:01 +0000 Subject: packages/apt/apt_0.6.46.2.bb packages/apt/apt.inc packages/apt/apt-package.inc : build and package shared libs at all times. --- packages/apt/apt-package.inc | 17 ++++++++++++----- packages/apt/apt.inc | 6 ++++-- packages/apt/apt_0.6.46.2.bb | 3 +++ packages/apt/files/environment.patch | 13 +++++++++++++ 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 packages/apt/files/environment.patch diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc index 8bf2b56739..5a5d56930e 100644 --- a/packages/apt/apt-package.inc +++ b/packages/apt/apt-package.inc @@ -77,11 +77,18 @@ do_install () { install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - #eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - #oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - #oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so + install -d ${D}${libdir} + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg.so + eval `cat apt-inst/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-inst/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst.so install -d ${D}${libdir}/apt/methods install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc index dbf5765205..283b80d662 100644 --- a/packages/apt/apt.inc +++ b/packages/apt/apt.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg." LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://environment.patch;patch=1" S = "${WORKDIR}/apt-${PV}" inherit autotools gettext @@ -12,4 +13,5 @@ EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" # Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use # Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4) # Koen - 20070327 -EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4" +EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4" + diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb index 73285f37c3..24023f2a58 100644 --- a/packages/apt/apt_0.6.46.2.bb +++ b/packages/apt/apt_0.6.46.2.bb @@ -6,3 +6,6 @@ require apt-package.inc FILES_${PN} += "${bindir}/apt-key" apt-manpages += "doc/apt-key.8" + +PR = "r1" + diff --git a/packages/apt/files/environment.patch b/packages/apt/files/environment.patch new file mode 100644 index 0000000000..5bea1a0130 --- /dev/null +++ b/packages/apt/files/environment.patch @@ -0,0 +1,13 @@ +Index: apt-0.6.46.2/buildlib/environment.mak.in +=================================================================== +--- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 ++++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 +@@ -62,7 +62,7 @@ + + # Shared library things + HOST_OS = @host_os@ +-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) ++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + else -- cgit v1.2.3 From e916916c968c82478b0d4f3b09e25a49405ae04a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:04:44 +0000 Subject: xserver-kdrive: drop devfs.patch, nobody uses it anymore. --- packages/xorg-xserver/xserver-kdrive/devfs.patch | 47 ------------------------ 1 file changed, 47 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive/devfs.patch diff --git a/packages/xorg-xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch deleted file mode 100644 index a6238126c0..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/devfs.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xserver/hw/kdrive/linux/linux.c~devfs -+++ xserver/hw/kdrive/linux/linux.c -@@ -82,10 +82,10 @@ - vtno = kdVirtualTerminal; - else - { -- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) -+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) - { - FatalError( -- "LinuxInit: Cannot open /dev/tty0 (%s)\n", -+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", - strerror(errno)); - } - if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || -@@ -96,7 +96,7 @@ - } - close(fd); - -- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ -+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ - - if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) - { -@@ -113,7 +113,7 @@ - * - * Why is this needed? - */ -- LinuxCheckChown ("/dev/tty0"); -+ LinuxCheckChown ("/dev/vc/0"); - /* - * Linux doesn't switch to an active vt after the last close of a vt, - * so we do this ourselves by remembering which is active now. -@@ -453,7 +453,7 @@ - activeVT = -1; - } - close(LinuxConsoleFd); /* make the vt-manager happy */ -- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); -+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); - if (fd >= 0) - { - memset (&vts, '\0', sizeof (vts)); /* valgrind */ -- cgit v1.2.3 From fd6a046d64f69c38be873309680b16c656dbb1f0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:05:33 +0000 Subject: xserver-kdrive-1.2: simplify enable-tslib.patch --- .../xserver-kdrive-1.2.0/enable-tslib.patch | 25 ---------------------- 1 file changed, 25 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch index 615f27a7c1..9a59530ed3 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -1,28 +1,3 @@ -Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 -@@ -6,6 +6,10 @@ - - bin_PROGRAMS = Xfbdev - -+if TSLIB -+TSLIB_FLAG = -lts -+endif -+ - libfbdev_a_SOURCES = \ - fbdev.c \ - fbdev.h -@@ -16,7 +20,8 @@ - Xfbdev_LDADD = \ - libfbdev.a \ - @KDRIVE_LIBS@ \ -- @XSERVER_LIBS@ -+ @XSERVER_LIBS@ \ -+ $(TSLIB_FLAG) - - Xfbdev_DEPENDENCIES = \ - libfbdev.a Index: xorg-server-1.2.0/configure.ac =================================================================== --- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200 -- cgit v1.2.3 From 0bb019850b4d6e84a81c4b06485280a02e1b5a72 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:48:15 +0000 Subject: package_ipk.bbclass: add epoch support --- classes/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 70bcdf6b7f..19c082d978 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -142,7 +142,11 @@ python do_package_ipk () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) -- cgit v1.2.3 From fa30c973cc72f69f469bfcffb210069ee443351b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:50:18 +0000 Subject: package.bbclass: added support for private libraries (used only in package) - if package contain libraries which are not used outside then add PRIVATE_LIBS variable with names of them to not generate shlibs for them. --- classes/package.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index 07fdb7f890..19c206ae5e 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -573,6 +573,7 @@ python package_do_shlibs() { bb.mkdirhier(shlibs_dir) needed = {} + private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1) for pkg in packages.split(): needs_ldconfig = False bb.debug(2, "calculating shlib provides for %s" % pkg) @@ -596,7 +597,9 @@ python package_do_shlibs() { needed[pkg].append(m.group(1)) m = re.match("\s+SONAME\s+([^\s]*)", l) if m and not m.group(1) in sonames: - sonames.append(m.group(1)) + # if library is private (only used by package) then do not build shlib for it + if private_libs == '' or -1 == private_libs.find(m.group(1)): + sonames.append(m.group(1)) if m and libdir_re.match(root): needs_ldconfig = True shlibs_file = os.path.join(shlibs_dir, pkg + ".list") -- cgit v1.2.3 From 427c202b3f3419a517b12a75774d6ad2837243e3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:50:43 +0000 Subject: bitbake.conf: add epoch support --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 947afc3018..12f663ae4b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PF = "${PN}-${PV}-${PR}" +PF = "${PN}-${EXTENDPE}${PV}-${PR}" +EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" # Package info. -- cgit v1.2.3 From c8b71beba89a1d40d4b195df28f5e753a03f876c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:53:15 +0000 Subject: dates/openmoko-dates: mark libgtkdatesview.so as PRIVATE, make them conflict - both packages provide libgtkdatesview.so.0 which is not used outside of dates - both packages provide binaries of same names --- packages/openmoko-pim/openmoko-dates_svn.bb | 5 ++++- packages/pimlico/dates.inc | 3 +++ packages/pimlico/dates_0.3.1.bb | 2 +- packages/pimlico/dates_svn.bb | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index 346a8d03e1..cc5978f546 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,8 +3,10 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" +RCONFLICTS = "dates" +RREPLACES = "dates" PV = "0.1+svn${SRCDATE}" -PR = "r6" +PR = "r7" inherit gnome autotools pkgconfig gtk-icon-cache @@ -23,3 +25,4 @@ do_install_append () { FILES_${PN} += "${datadir}/pixmaps/dates.png \ ${datadir}/dates/" +PRIVATE_LIBS = "libgtkdatesview.so.0" diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index fd640844ba..641ff60aea 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -3,6 +3,8 @@ LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" +RCONFLICTS = "openmoko-dates" +RREPLACES = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache @@ -15,3 +17,4 @@ do_install_append () { install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ } +PRIVATE_LIBS = "libgtkdatesview.so.0" diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb index 51d3acc9ed..731ca31289 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.3.1.bb @@ -1,5 +1,5 @@ require dates.inc -PR = "r1" +PR = "r2" SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index 474fdde27a..956eb3dc64 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,5 +1,7 @@ require dates.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" PV = "0.3.1+svn${SRCDATE}" -- cgit v1.2.3 From dd4760f7cedf0fd50bde55efd565c88e7d794cc8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:54:23 +0000 Subject: X11R7.1: prefer libxfont-native 1.2.0 as we use freetype 2.3.x --- conf/distro/include/preferred-xorg-versions-X11R7.1.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 27a6164e54..782549589d 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -153,7 +153,7 @@ PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" -PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" -- cgit v1.2.3 From f136df84b633c76c600bb2b46637e189e5db176b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:55:13 +0000 Subject: acpid: use update-rc.d class --- packages/acpid/acpid.inc | 19 +++++-------------- packages/acpid/acpid_1.0.2.bb | 2 +- packages/acpid/acpid_1.0.3.bb | 2 +- packages/acpid/acpid_1.0.4.bb | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/packages/acpid/acpid.inc b/packages/acpid/acpid.inc index c96f431224..69517a7681 100644 --- a/packages/acpid/acpid.inc +++ b/packages/acpid/acpid.inc @@ -5,6 +5,11 @@ LICENSE="GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ file://init" +inherit update-rc.d + +INITSCRIPT_NAME = "acpid" +INITSCRIPT_PARAMS = "defaults" + EXTRA_OEMAKE = "" do_compile () { oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' @@ -16,17 +21,3 @@ do_install () { cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid chmod 755 ${D}${sysconfdir}/init.d/acpid } - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D acpid remove -} diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb index 1b48266a9c..2a305eeac4 100644 --- a/packages/acpid/acpid_1.0.2.bb +++ b/packages/acpid/acpid_1.0.2.bb @@ -1,3 +1,3 @@ require acpid.inc -PR = "r1" +PR = "r2" diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb index d67ea96875..640acd5203 100644 --- a/packages/acpid/acpid_1.0.3.bb +++ b/packages/acpid/acpid_1.0.3.bb @@ -1,4 +1,4 @@ require acpid.inc SRC_URI += "file://gcc40.patch;patch=1" -PR = "r1" +PR = "r2" diff --git a/packages/acpid/acpid_1.0.4.bb b/packages/acpid/acpid_1.0.4.bb index d67ea96875..640acd5203 100644 --- a/packages/acpid/acpid_1.0.4.bb +++ b/packages/acpid/acpid_1.0.4.bb @@ -1,4 +1,4 @@ require acpid.inc SRC_URI += "file://gcc40.patch;patch=1" -PR = "r1" +PR = "r2" -- cgit v1.2.3 From 8bd9a586faa6891c04882a4f36043a3437b59194 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:56:28 +0000 Subject: aumix: added ncurses to dependencies --- packages/aumix/aumix_2.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aumix/aumix_2.8.bb b/packages/aumix/aumix_2.8.bb index 3edd51ddd9..50f2cec07a 100644 --- a/packages/aumix/aumix_2.8.bb +++ b/packages/aumix/aumix_2.8.bb @@ -1,7 +1,7 @@ -DEPENDS = "ncurses" DESCRIPTION = "A mixer for the terminal or X11, with mouse support." SECTION = "console/multimedia" LICENSE = "GPLV2" +DEPENDS = "ncurses" SRC_URI = "http://jpj.net/~trevor/aumix/aumix-${PV}.tar.bz2 \ file://configure.patch;patch=1" -- cgit v1.2.3 From 7ca9b39e2634a00c8af78f84f14fca369d946811 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:57:43 +0000 Subject: package_deb.bbclass: add epoch support --- classes/package_deb.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 9697426d5d..388f9819bd 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -138,7 +138,11 @@ python do_package_deb () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) -- cgit v1.2.3 From 4a78a42b65821710892c27dc20a821e35e95eb1e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:00:10 +0000 Subject: edje-native: fix staging --- packages/efl/edje-native_0.5.0.037.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index 1dc5c1de10..2b8c43644a 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -12,7 +12,7 @@ do_configure_prepend() { sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } -do_stage_append() { +do_install_append() { edje_data_dir=`edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include -- cgit v1.2.3 From d1406ee2bd3dcb5136d2d96daefd1e93505eaac6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:00:20 +0000 Subject: libx11-1.1.1: makekeys.diff is applied upstream --- packages/xorg-lib/libx11_1.1.1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 88225a8eb7..07e0286a13 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -2,7 +2,6 @@ require xorg-lib-common.inc PE = "1" DESCRIPTION = "Base X libs." -SRC_URI += "file://makekeys.diff;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxcb libxdmcp xf86bigfontproto kbproto inputproto" -- cgit v1.2.3 From 02e60d26770c6c1007f2f63944020d72422654c9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:02:23 +0000 Subject: gpe-mini-browser: do not comment code but remove it. we have SCM --- packages/gpe-mini-browser/gpe-mini-browser_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb index 67c16862e8..30d9d83a49 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -50,4 +50,4 @@ pkg_postrm_${PN}-doc () { require gpe-mini-browser.inc -DEFAULT_PREFERENCE = "-1" +#DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 4fa85ceb0d08112ed4dcdb10b9e54310735cf70a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:03:21 +0000 Subject: gst-plugins-good: depend on gst-plugins-base (from Poky) --- packages/gstreamer/gst-plugins-good_0.10.5.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/gstreamer/gst-plugins-good_0.10.5.bb diff --git a/packages/gstreamer/gst-plugins-good_0.10.5.bb b/packages/gstreamer/gst-plugins-good_0.10.5.bb new file mode 100644 index 0000000000..42f6df4d9d --- /dev/null +++ b/packages/gstreamer/gst-plugins-good_0.10.5.bb @@ -0,0 +1,4 @@ +require gst-plugins.inc + +DEPENDS += "gst-plugins-base" +PR = "r2" -- cgit v1.2.3 From 9bcd8283bdebc7cf75a7b1ff456a44745d3e325b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:04:36 +0000 Subject: hostap-daemon: do not depend on hostap-modules as they are 2.4 only now --- packages/hostap/hostap-daemon.inc | 2 +- packages/hostap/hostap-daemon_0.3.7.bb | 2 +- packages/hostap/hostap-daemon_0.4.4.bb | 2 +- packages/hostap/hostap-daemon_0.4.8.bb | 2 ++ packages/hostap/hostap-daemon_0.5.1.bb | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc index 08a6dba1f7..f723d07575 100644 --- a/packages/hostap/hostap-daemon.inc +++ b/packages/hostap/hostap-daemon.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://hostap.epitest.fi" SECTION = "kernel/userland" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "hostap-modules hostap-utils (${PV})" +RDEPENDS = "hostap-utils (${PV})" DEPENDS = "openssl" DEPENDS_append_mtx-1 = " madwifi-modules" DEPENDS_append_mtx-2 = " madwifi-modules" diff --git a/packages/hostap/hostap-daemon_0.3.7.bb b/packages/hostap/hostap-daemon_0.3.7.bb index a211dd0759..bece7d1450 100644 --- a/packages/hostap/hostap-daemon_0.3.7.bb +++ b/packages/hostap/hostap-daemon_0.3.7.bb @@ -1,3 +1,3 @@ require hostap-daemon.inc -PR = "r1" +PR = "r2" diff --git a/packages/hostap/hostap-daemon_0.4.4.bb b/packages/hostap/hostap-daemon_0.4.4.bb index a211dd0759..bece7d1450 100644 --- a/packages/hostap/hostap-daemon_0.4.4.bb +++ b/packages/hostap/hostap-daemon_0.4.4.bb @@ -1,3 +1,3 @@ require hostap-daemon.inc -PR = "r1" +PR = "r2" diff --git a/packages/hostap/hostap-daemon_0.4.8.bb b/packages/hostap/hostap-daemon_0.4.8.bb index 4ef749c407..de3abdbea5 100644 --- a/packages/hostap/hostap-daemon_0.4.8.bb +++ b/packages/hostap/hostap-daemon_0.4.8.bb @@ -1,3 +1,5 @@ require hostap-daemon.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb index 4ef749c407..de3abdbea5 100644 --- a/packages/hostap/hostap-daemon_0.5.1.bb +++ b/packages/hostap/hostap-daemon_0.5.1.bb @@ -1,3 +1,5 @@ require hostap-daemon.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 77a94fcb3c7df953ae60f0d972550299825b823f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 29 Mar 2007 13:06:27 +0000 Subject: picocom: fix building - close #1972 --- packages/picocom/picocom_1.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/picocom/picocom_1.4.bb b/packages/picocom/picocom_1.4.bb index 8bc3b89e8c..c13bdabcc3 100644 --- a/packages/picocom/picocom_1.4.bb +++ b/packages/picocom/picocom_1.4.bb @@ -2,12 +2,13 @@ DESCRIPTION = "Lightweight and minimal (~20K) dumb-terminal emulation program." SECTION = "console/utils" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz \ + file://nolock.patch;patch=1 \ file://gcc4.patch;patch=1" -CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR' +CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\"' do_install () { install -d ${D}${bindir} -- cgit v1.2.3 From dd582206fe052dbdabdb617ea803f0c47ea2fdea Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:07:27 +0000 Subject: starling: fixed dependencies - close #2055 --- packages/starling/starling_0.1.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb index 2dc8da8bc1..fab79342ac 100644 --- a/packages/starling/starling_0.1.bb +++ b/packages/starling/starling_0.1.bb @@ -6,19 +6,16 @@ PR = "r1" inherit gpe autotools DESCRIPTION = "Starling audio player for GPE" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" RDEPENDS = "esd \ - gst-plugins \ - gst-plugin-audio \ gst-plugin-audioconvert \ - gst-plugin-audiofile \ gst-plugin-esd \ gst-plugin-typefindfunctions \ gst-plugin-decodebin \ gst-plugin-volume" RRECOMMENDS = "gst-plugin-mad \ - gst-plugin-tagedit \ + gst-plugin-modplug \ gst-plugin-ivorbis \ gst-plugin-tcp" -- cgit v1.2.3 From 422076569aeb070ddd92af6650231aeadf75b159 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:08:43 +0000 Subject: uucp: package /usr/spool/uucp/ (empty) for cu --- packages/uucp/uucp_1.07.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/uucp/uucp_1.07.bb b/packages/uucp/uucp_1.07.bb index 948f251e70..7247ecbabe 100644 --- a/packages/uucp/uucp_1.07.bb +++ b/packages/uucp/uucp_1.07.bb @@ -1,6 +1,7 @@ DESCRIPTION = "UUCP is used to transfer mail, news and random files between systems which are not connected by more modern networks. The communication can be made via modems, direct (hard-wired) serial connections or via an IP connection." LICENSE = "GPLv2" SECTION = "console" +PR = "r1" inherit autotools @@ -11,6 +12,9 @@ do_configure() { oe_runconf } +do_install_append() { + fakeroot install -d -g uucp -o uucp ${D}/usr/spool/uucp +} PACKAGES =+ "cu" -FILES_cu = "${bindir}/cu" +FILES_cu = "${bindir}/cu /usr/spool" -- cgit v1.2.3 From 00154e90efa8f3004a1a14fe323c3377751fb1cd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:16:55 +0000 Subject: disapproval of revision '0d2e69a0248ac99b9f990dfb473d63c9653f0f7c' --- classes/package.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index 19c206ae5e..07fdb7f890 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -573,7 +573,6 @@ python package_do_shlibs() { bb.mkdirhier(shlibs_dir) needed = {} - private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1) for pkg in packages.split(): needs_ldconfig = False bb.debug(2, "calculating shlib provides for %s" % pkg) @@ -597,9 +596,7 @@ python package_do_shlibs() { needed[pkg].append(m.group(1)) m = re.match("\s+SONAME\s+([^\s]*)", l) if m and not m.group(1) in sonames: - # if library is private (only used by package) then do not build shlib for it - if private_libs == '' or -1 == private_libs.find(m.group(1)): - sonames.append(m.group(1)) + sonames.append(m.group(1)) if m and libdir_re.match(root): needs_ldconfig = True shlibs_file = os.path.join(shlibs_dir, pkg + ".list") -- cgit v1.2.3 From 5c164a27251aa8be7cbb8916a13919052387c3bd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 13:25:19 +0000 Subject: package.bbclass: fix build problem related to private libs --- classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index 19c206ae5e..3e80b2b31c 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -598,7 +598,7 @@ python package_do_shlibs() { m = re.match("\s+SONAME\s+([^\s]*)", l) if m and not m.group(1) in sonames: # if library is private (only used by package) then do not build shlib for it - if private_libs == '' or -1 == private_libs.find(m.group(1)): + if not private_libs or -1 == private_libs.find(m.group(1)): sonames.append(m.group(1)) if m and libdir_re.match(root): needs_ldconfig = True -- cgit v1.2.3 From d3e02ad77748dffa0c1027ba0dcd45ca34e3c0c0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:30:19 +0000 Subject: magician.conf: add ohci-hcd kernel module, don't build jffs2 images for now --- conf/machine/magician.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 3d1b602def..f2505dcab5 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -19,6 +19,11 @@ VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget" +# +# We don't support jffs2 installations (yet). +# +IMAGE_FSTYPES = "tar.bz2" + # # Software/packages selection # @@ -34,6 +39,7 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-pxaficp-ir \ kernel-module-uinput \ kernel-module-hci-usb \ + kernel-module-ohci-hcd \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ -- cgit v1.2.3 From 831e97601a7bd95f3e71567a51ce31dab5eaa2a6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:38:19 +0000 Subject: fic-gta01.conf: remove obsolete padding --- conf/machine/fic-gta01.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 9bb24874a9..dcf3409723 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -32,7 +32,7 @@ MACHINE_TASK_PROVIDER = "task-base" ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n" +EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n" # build tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native" -- cgit v1.2.3 From 470f71b8affaf52c3676124b985cba5ae27eb11b Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:43:13 +0000 Subject: magician.conf: add usbhost MACHINE_FEATURE, drop kernel modules that are taken care of by task-base --- conf/machine/magician.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index f2505dcab5..02fdea6c59 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" # # We don't support jffs2 installations (yet). @@ -36,10 +36,6 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-leds-magician \ kernel-module-magician-ts \ - kernel-module-pxaficp-ir \ - kernel-module-uinput \ - kernel-module-hci-usb \ - kernel-module-ohci-hcd \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ -- cgit v1.2.3 From 15617c12e48574db3a7c6bb9816c51d98d18ea3c Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:47:39 +0000 Subject: gsmd: remove unneeded stty call from init script --- packages/gsm/files/gsmd | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 254fe0a451..4b8db5d5a5 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -48,7 +48,6 @@ start() { # if [ -e "${GSM_DEV}" ] then - stty -F ${GSM_DEV} crtscts gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & echo "success" else -- cgit v1.2.3 From bed68c5e384d4990dd53489e68e2f40a506355b5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:49:14 +0000 Subject: linux-handhelds-2.6: update hx4700 defconfig for 2.6.20 --- .../linux/linux-handhelds-2.6/hx4700/defconfig | 67 +++++++++++++++------- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 8914f07dbb..3a0d50e096 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -153,6 +153,10 @@ CONFIG_HX4700_BLUETOOTH=y CONFIG_HX4700_PCMCIA=y CONFIG_HX4700_LCD=y CONFIG_HX4700_LEDS=y +CONFIG_HX4700_BATTERY=m +CONFIG_HX4700_POWER=y +CONFIG_HX4700_UDC=y +CONFIG_HX4700_SERIAL=y # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set @@ -166,17 +170,18 @@ CONFIG_HX4700_LEDS=y # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y CONFIG_IWMMXT=y -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set +CONFIG_PXA27x_VOLTAGE=m +CONFIG_PXA27x_VOLTAGE_MAX158xx=m # # Linux As Bootloader @@ -386,24 +391,12 @@ CONFIG_BRIDGE_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -# CONFIG_IP_NF_CT_PROTO_SCTP is not set -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -# CONFIG_IP_NF_TFTP is not set -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_SIP is not set # CONFIG_IP_NF_QUEUE is not set # @@ -567,6 +560,7 @@ CONFIG_MTD_PARTITIONS=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -909,7 +903,7 @@ CONFIG_KEYBOARD_ATKBD=m # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_GPIO_KEYS=y -# CONFIG_KEYBOARD_ASIC3 is not set +CONFIG_KEYBOARD_ASIC3=y # CONFIG_KEYBOARD_PXA27x is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set @@ -954,6 +948,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y @@ -1052,7 +1047,22 @@ CONFIG_I2C_PXA=m # # Dallas's 1-wire bus # -# CONFIG_W1 is not set +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_DS2482 is not set +# CONFIG_W1_DS1WM is not set + +# +# 1-wire Slaves +# +# CONFIG_W1_SLAVE_THERM is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2433 is not set +CONFIG_W1_DS2760=m # # Hardware Monitoring support @@ -1097,12 +1107,18 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set +# +# Hardware Monitoring - Battery +# CONFIG_BATTERY_MONITOR=y +CONFIG_DS2760_BATTERY=m +CONFIG_ADC_BATTERY=m +CONFIG_APM_POWER=y # # L3 serial bus support # -CONFIG_L3=m +# CONFIG_L3 is not set # # SoC drivers @@ -1115,6 +1131,7 @@ CONFIG_L3=m # CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y +CONFIG_HTC_ASIC3_DS1WM=y # CONFIG_SOC_TSC2101 is not set # CONFIG_SOC_TSC2200 is not set @@ -1126,7 +1143,8 @@ CONFIG_HTC_ASIC3=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set -# CONFIG_ADC_ADS7846_SSP is not set +CONFIG_ADC_ADS7846_SSP=y +# CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set # @@ -1145,7 +1163,7 @@ CONFIG_LEDS_ASIC3=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_TIMER_ASIC3=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set # CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y @@ -1316,6 +1334,11 @@ CONFIG_SND_AK4641=m # # CONFIG_SOUND_PRIME is not set +# +# HID Devices +# +CONFIG_HID=y + # # USB support # @@ -1475,6 +1498,7 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set @@ -1620,7 +1644,6 @@ CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y -- cgit v1.2.3 From b190552075365aec7aa70f007355f80a0d7ffe00 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:50:13 +0000 Subject: linux-handhelds-2.6: update magician defconfig for 2.6.20 --- .../linux/linux-handhelds-2.6/magician/defconfig | 83 +++++++++++++++------- 1 file changed, 57 insertions(+), 26 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 112a49f206..55ce78a331 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19-hh7 -# Tue Jan 9 15:26:27 2007 +# Linux kernel version: 2.6.20-hh3 +# Sun Mar 25 13:00:41 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -11,6 +11,8 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y @@ -40,6 +42,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -79,7 +82,9 @@ CONFIG_KMOD=y # Block layer # CONFIG_BLOCK=y +# CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -113,6 +118,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set @@ -153,28 +159,27 @@ CONFIG_MAGICIAN_PM=y CONFIG_MAGICIAN_TS=m CONFIG_MAGICIAN_LCD=y CONFIG_MAGICIAN_CPLD=y -CONFIG_MAGICIAN_DS1WM=m +CONFIG_MAGICIAN_DS1WM=y CONFIG_MAGICIAN_PHONE=m CONFIG_MAGICIAN_FLASH=m # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y -CONFIG_IWMMXT=y CONFIG_PXA_SSP=m CONFIG_PXA_SUSPEND_SAVE_EXTRA_REGS=y -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -198,13 +203,10 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y CONFIG_XSCALE_PMU=y # CONFIG_KEXEC is not set -# -# Compaq/iPAQ Platforms -# - # # Compaq/iPAQ Drivers # @@ -279,6 +281,7 @@ CONFIG_BINFMT_ELF=y CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set +# CONFIG_DPM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_APM=y @@ -321,6 +324,7 @@ CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set @@ -447,7 +451,8 @@ CONFIG_FW_LOADER=y # # Connector - unified userspace <-> kernelspace linker # -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y # # Memory Technology Devices (MTD) @@ -464,6 +469,7 @@ CONFIG_MTD_PARTITIONS=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_FTL is not set @@ -690,6 +696,9 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=m +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -719,7 +728,9 @@ CONFIG_HW_CONSOLE=y CONFIG_SERIAL_PXA=y # CONFIG_SERIAL_PXA_CONSOLE is not set CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y +# CONFIG_RS232_SERIAL is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -737,10 +748,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_SA1100_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# # CONFIG_RAW_DRIVER is not set # @@ -797,7 +804,7 @@ CONFIG_I2C_PXA=y # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y CONFIG_W1_CON=y # @@ -805,7 +812,7 @@ CONFIG_W1_CON=y # # CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set -CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_DS1WM=y # # 1-wire Slaves @@ -813,7 +820,7 @@ CONFIG_W1_MASTER_DS1WM=m # CONFIG_W1_SLAVE_THERM is not set # CONFIG_W1_SLAVE_SMEM is not set # CONFIG_W1_SLAVE_DS2433 is not set -CONFIG_W1_DS2760=m +CONFIG_W1_DS2760=y # # Hardware Monitoring support @@ -847,6 +854,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set @@ -854,6 +862,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83781D is not set # CONFIG_SENSORS_W83791D is not set # CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set @@ -863,7 +872,10 @@ CONFIG_HWMON=y # Hardware Monitoring - Battery # CONFIG_BATTERY_MONITOR=y -CONFIG_MAGICIAN_BATTERY=m +CONFIG_MAGICIAN_BATTERY=y +CONFIG_DS2760_BATTERY=y +# CONFIG_ADC_BATTERY is not set +CONFIG_APM_POWER=y # # L3 serial bus support @@ -893,7 +905,8 @@ CONFIG_MAGICIAN_BATTERY=m # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set -# CONFIG_ADC_ADS7846_SSP is not set +CONFIG_ADC_ADS7846_SSP=m +# CONFIG_ADC_AD7877 is not set # CONFIG_TIFM_CORE is not set # @@ -912,6 +925,7 @@ CONFIG_LEDS_MAGICIAN=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m +# CONFIG_LEDS_TRIGGER_HWTIMER is not set CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_SHARED is not set @@ -988,8 +1002,10 @@ CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y @@ -1007,8 +1023,8 @@ CONFIG_SND_VERBOSE_PROCFS=y # # ALSA ARM devices # -# CONFIG_SND_HTCMAGICIAN is not set # CONFIG_SND_PXA2XX_AC97 is not set +# CONFIG_SND_RECON is not set # # USB devices @@ -1032,6 +1048,7 @@ CONFIG_SND_PXA2xx_SOC_I2S=m CONFIG_SND_PXA2xx_SOC_SSP=m CONFIG_SND_PXA2xx_SOC_MAGICIAN=m # CONFIG_SND_PXA2xx_SOC_BLUEANGEL is not set +# CONFIG_SND_PXA2xx_SOC_H5000 is not set # # SoC Audio for the Atmel AT91 @@ -1057,6 +1074,7 @@ CONFIG_SND_PXA2xx_SOC_MAGICIAN=m # CONFIG_SND_SOC_WM8772 is not set # CONFIG_SND_SOC_WM8971 is not set # CONFIG_SND_SOC_WM8956 is not set +# CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8976 is not set # CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM8980 is not set @@ -1070,6 +1088,11 @@ CONFIG_SND_SOC_UDA1380=m # # CONFIG_SOUND_PRIME is not set +# +# HID Devices +# +CONFIG_HID=y + # # USB support # @@ -1327,7 +1350,6 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set # CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set @@ -1424,6 +1446,11 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # @@ -1437,6 +1464,8 @@ CONFIG_OPROFILE=m CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y @@ -1453,15 +1482,12 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y CONFIG_FORCED_INLINING=y -# CONFIG_HEADERS_CHECK is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_WAITQ is not set CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_LL=y # CONFIG_DEBUG_ICEDCC is not set @@ -1481,6 +1507,7 @@ CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -1489,8 +1516,10 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m @@ -1515,6 +1544,7 @@ CONFIG_CRYPTO_TEST=m # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set CONFIG_CRC32=y @@ -1522,3 +1552,4 @@ CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y -- cgit v1.2.3 From 80d223793ae8656412c94857336538b1b255ed33 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:51:18 +0000 Subject: puzzles: add libxt dependency --- packages/puzzles/puzzles_r6915.bb | 47 --------------------------------------- packages/puzzles/puzzles_r7387.bb | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 packages/puzzles/puzzles_r6915.bb create mode 100644 packages/puzzles/puzzles_r7387.bb diff --git a/packages/puzzles/puzzles_r6915.bb b/packages/puzzles/puzzles_r6915.bb deleted file mode 100644 index 4349a4154b..0000000000 --- a/packages/puzzles/puzzles_r6915.bb +++ /dev/null @@ -1,47 +0,0 @@ - -DEPENDS = "gtk+" -PR = "r2" - -SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ - file://game.png" - -do_compile_prepend = " \ - export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ - export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " - -FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" -FILES_${PN}-dbg += "${prefix}/games/.debug" - -do_install () { - rm -rf ${D}/* - export prefix=${D} - export DESTDIR=${D} - install -d ${D}/${prefix}/ - install -d ${D}/${prefix}/games/ - oe_runmake install - - install -d ${D}/${datadir}/ - install -d ${D}/${datadir}/applications/ - install -d ${D}/${datadir}/pixmaps/ - - install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ - - cd ${D}/${prefix}/games - for prog in *; do - if [ -x $prog ]; then - echo "making ${D}/${datadir}/applications/$prog.desktop" - cat < ${D}/${datadir}/applications/$prog.desktop -[Desktop Entry] -Encoding=UTF-8 -Name=$prog -Exec=${prefix}/games/$prog -Icon=game.png -Terminal=false -Type=Application -Categories=Game -StartupNotify=true -SingleInstance=true -STOP - fi - done -} diff --git a/packages/puzzles/puzzles_r7387.bb b/packages/puzzles/puzzles_r7387.bb new file mode 100644 index 0000000000..9b3b3842c7 --- /dev/null +++ b/packages/puzzles/puzzles_r7387.bb @@ -0,0 +1,47 @@ + +DEPENDS = "gtk+ libxt" +PR = "r2" + +SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ + file://game.png" + +do_compile_prepend = " \ + export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ + export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " + +FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" +FILES_${PN}-dbg += "${prefix}/games/.debug" + +do_install () { + rm -rf ${D}/* + export prefix=${D} + export DESTDIR=${D} + install -d ${D}/${prefix}/ + install -d ${D}/${prefix}/games/ + oe_runmake install + + install -d ${D}/${datadir}/ + install -d ${D}/${datadir}/applications/ + install -d ${D}/${datadir}/pixmaps/ + + install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ + + cd ${D}/${prefix}/games + for prog in *; do + if [ -x $prog ]; then + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat < ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Encoding=UTF-8 +Name=$prog +Exec=${prefix}/games/$prog +Icon=game.png +Terminal=false +Type=Application +Categories=Game +StartupNotify=true +SingleInstance=true +STOP + fi + done +} -- cgit v1.2.3 From ffd5a7ccc05c74b7229cb250f4d9f5031208dd65 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:55:37 +0000 Subject: angstrom-2007.1.conf: add avahi-autoipd --- conf/distro/angstrom-2007.1.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 8d74633821..59a65de663 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -85,7 +85,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20070303" -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" +#PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" @@ -139,9 +139,9 @@ PREFERRED_VERSION_glib-2.0 = "2.12.10" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +require conf/distro/include/preferred-xorg-versions-X11R7.2.inc -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" +#PREFERRED_VERSION_xserver-kdrive = "1.2.0" PREFERRED_VERSION_gtk+ = "2.10.10" PREFERRED_VERSION_libgnomeui = "2.16.1" @@ -276,6 +276,7 @@ DISTRO_EXTRA_RDEPENDS += "\ ipkg ipkg-collateral \ util-linux-mount util-linux-umount \ avahi-daemon \ + avahi-autoipd \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ " -- cgit v1.2.3 From c8bf57cbfc56f4d5de1f5ff4e448824a657ba1dd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:59:24 +0000 Subject: gimp: fix debug packaging --- packages/gimp/gimp_2.3.10.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb index eec0be6fd8..a1e875be89 100644 --- a/packages/gimp/gimp_2.3.10.bb +++ b/packages/gimp/gimp_2.3.10.bb @@ -11,6 +11,9 @@ SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ inherit autotools pkgconfig +FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \ + ${libdir}/gimp/2.0/plug-ins/.debug" + #Don't laugh, this just builds a threaded gimp EXTRA_OECONF = " --disable-gtktest \ --disable-print \ -- cgit v1.2.3 From 48bb4a727af559b6174c090ab89a958bff80cb42 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:03:53 +0000 Subject: libgsmd: add TI/HTC GSM chipset support and ldisc switching support for magician - this is a temporary measure and will be reverted once machine plugin support is in place --- packages/gsm/files/magician/ldisc.patch | 66 +++++ packages/gsm/files/magician/vendor-tihtc.patch | 325 +++++++++++++++++++++++++ packages/gsm/libgsmd_svn.bb | 3 + 3 files changed, 394 insertions(+) create mode 100644 packages/gsm/files/magician/ldisc.patch create mode 100644 packages/gsm/files/magician/vendor-tihtc.patch diff --git a/packages/gsm/files/magician/ldisc.patch b/packages/gsm/files/magician/ldisc.patch new file mode 100644 index 0000000000..30d4a8812a --- /dev/null +++ b/packages/gsm/files/magician/ldisc.patch @@ -0,0 +1,66 @@ +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-29 15:29:31.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-29 15:33:07.000000000 +0200 +@@ -32,6 +32,7 @@ + #define _GNU_SOURCE + #include + ++#include + #include + #include + +@@ -150,6 +151,7 @@ + { "speed", 1, NULL, 's' }, + { "logfile", 1, NULL, 'l' }, + { "hwflow", 0, NULL, 'F' }, ++ { "ldisc", 1, NULL, 'D' }, + { "leak-report", 0, NULL, 'L' }, + { 0, 0, 0, 0 } + }; +@@ -165,6 +167,7 @@ + "\t-p dev\t--device dev\tSpecify serial device to be used\n" + "\t-s spd\t--speed spd\tSpecify speed in bps (9600,38400,115200,...)\n" + "\t-F\t--hwflow\tHardware Flow Control (RTS/CTS)\n" ++ "\t-D\t--ldisc num\tSet line discipline (0=N_TTY,...)\n" + "\t-L\t--leak-report\tLeak Report of talloc memory allocator\n" + "\t-l file\t--logfile file\tSpecify a logfile to log to\n" + ); +@@ -191,6 +194,7 @@ + int daemonize = 0; + int bps = 115200; + int hwflow = 0; ++ int ldisc = 0; + char *device = "/dev/ttyUSB0"; + char *logfile = "syslog"; + +@@ -202,7 +206,7 @@ + gsmd_tallocs = talloc_named_const(NULL, 1, "GSMD"); + + /*FIXME: parse commandline, set daemonize, device, ... */ +- while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:", opts, NULL)) != -1) { ++ while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:D:", opts, NULL)) != -1) { + switch (argch) { + case 'V': + /* FIXME */ +@@ -232,6 +236,8 @@ + fprintf(stderr, "can't open logfile `%s'\n", optarg); + exit(2); + } ++ case 'D': ++ ldisc = atoi(optarg); + break; + } + } +@@ -249,6 +255,11 @@ + exit(1); + } + ++ if (ldisc && ioctl(fd, TIOCSETD, &ldisc) < 0) { ++ fprintf(stderr, "can't set line discipline\n"); ++ exit(1); ++ } ++ + if (gsmd_initialize(&g) < 0) { + fprintf(stderr, "internal error\n"); + exit(1); diff --git a/packages/gsm/files/magician/vendor-tihtc.patch b/packages/gsm/files/magician/vendor-tihtc.patch new file mode 100644 index 0000000000..a2f22ffbea --- /dev/null +++ b/packages/gsm/files/magician/vendor-tihtc.patch @@ -0,0 +1,325 @@ +Index: gsm/src/gsmd/vendor_tihtc.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gsm/src/gsmd/vendor_tihtc.c 2007-03-27 13:12:05.000000000 +0200 +@@ -0,0 +1,294 @@ ++/* TI [Calypso] with HTC firmware gsmd plugin ++ * ++ * Written by Philipp Zabel ++ * based on vendor_ti.c ++ * ++ * 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., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "gsmd.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#if 0 ++#include "vendorplugin.h" ++ ++static int ++ti_getopt(struct gsmd *gh, int optname, void *optval, int *optlen) ++{ ++ switch (optname) { ++ case GSMD_OPT_CIPHER_IND: ++ /* FIXME: send AT%CPRI=? */ ++ break; ++ default: ++ return -EINVAL; ++ } ++} ++ ++static int ++ti_setopt(struct gsmd *gh, int optname, const void *optval, int optlen) ++{ ++ switch (optname) { ++ case GSMD_OPT_CIPHER_IND: ++ /* FIXME: send AT%CPRI= */ ++ break; ++ default: ++ return -EINVAL; ++ } ++} ++ ++#endif ++ ++ ++static int htccsq_parse(char *buf, int len, const char *param, ++ struct gsmd *gsmd) ++{ ++ char *tok; ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, ++ sizeof(*aux)); ++ ++ DEBUGP("entering htccsq_parse param=`%s'\n", param); ++ if (!ucmd) ++ return -EINVAL; ++ ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ /* FIXME: contains values 1-5, should be mapped to 0-31 somehow? */ ++ /* 2 --> 11 */ ++ aux->u.signal.sigq.rssi = atoi(buf); ++ aux->u.signal.sigq.ber = 99; ++ ++ DEBUGP("sending EVT_SIGNAL\n"); ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_SIGNAL); ++ ++ return 0; ++ ++out_free_io: ++ free(ucmd); ++ return -EIO; ++} ++ ++static int cpri_parse(char *buf, int len, const char *param, struct gsmd *gsmd) ++{ ++ char *tok1, *tok2; ++ ++ tok1 = strtok(buf, ","); ++ if (!tok1) ++ return -EIO; ++ ++ tok2 = strtok(NULL, ","); ++ if (!tok2) { ++ switch (atoi(tok1)) { ++ case 0: ++ gsmd->dev_state.ciph_ind.flags &= ~GSMD_CIPHIND_ACTIVE; ++ break; ++ case 1: ++ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_ACTIVE; ++ break; ++ case 2: ++ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_DISABLED_SIM; ++ break; ++ } ++ } else { ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, ++ GSMD_EVT_CIPHER, ++ sizeof(*aux)); ++ if (!ucmd) ++ return -ENOMEM; ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ aux->u.cipher.net_state_gsm = atoi(tok1); ++ aux->u.cipher.net_state_gsm = atoi(tok2); ++ ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_CIPHER); ++ } ++ ++ return 0; ++} ++ ++/* Call Progress Information */ ++static int cpi_parse(char *buf, int len, const char *param, struct gsmd *gsmd) ++{ ++ char *tok; ++ struct gsmd_evt_auxdata *aux; ++ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, ++ GSMD_EVT_OUT_STATUS, ++ sizeof(*aux)); ++ ++ DEBUGP("entering cpi_parse param=`%s'\n", param); ++ if (!ucmd) ++ return -EINVAL; ++ ++ aux = (struct gsmd_evt_auxdata *) ucmd->buf; ++ ++ /* Format: cId, msgType, ibt, tch, dir,[mode],[number],[type],[alpha],[cause],line */ ++ ++ /* call ID */ ++ tok = strtok(buf, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ /* message type (layer 3) */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ aux->u.call_status.prog = atoi(tok); ++ ++ /* in-band tones */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ if (*tok == '1') ++ aux->u.call_status.ibt = 1; ++ else ++ aux->u.call_status.ibt = 0; ++ ++ /* TCH allocated */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_free_io; ++ ++ if (*tok == '1') ++ aux->u.call_status.tch = 1; ++ else ++ aux->u.call_status.tch = 0; ++ ++ /* direction */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_send; ++ ++ switch (*tok) { ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ aux->u.call_status.dir = (*tok - '0'); ++ break; ++ default: ++ break; ++ } ++ ++ /* mode */ ++ tok = strtok(NULL, ","); ++ if (!tok) ++ goto out_send; ++ ++out_send: ++ usock_evt_send(gsmd, ucmd, GSMD_EVT_OUT_STATUS); ++ ++ return 0; ++ ++out_free_io: ++ talloc_free(ucmd); ++ return -EIO; ++} ++ ++static const struct gsmd_unsolicit tihtc_unsolicit[] = { ++ { "%HTCCSQ", &htccsq_parse }, /* Signal Quality */ ++ { "%CPRI", &cpri_parse }, /* Ciphering Indication */ ++ { "%CPI", &cpi_parse }, /* Call Progress Information */ ++ ++ /* FIXME: parse the below and generate the respective events */ ++ ++ /* %CGREG: reports extended information about GPRS registration state */ ++}; ++ ++static int cpi_detect_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) ++{ ++ struct gsmd *g = ctx; ++ struct gsm_extrsp *er; ++ ++ if (strncmp(resp, "%CPI: ", 6)) ++ return -EINVAL; ++ resp += 6; ++ ++ er = extrsp_parse(cmd, resp); ++ if (!er) ++ return -EINVAL; ++ ++ if (extrsp_supports(er, 0, 3)) ++ return gsmd_simplecmd(g, "AT%CPI=3"); ++ else if (extrsp_supports(er, 0, 2)) ++ return gsmd_simplecmd(g, "AT%CPI=2"); ++ else ++ DEBUGP("Call Progress Indication mode 2 or 3 not supported!!\n"); ++ ++ talloc_free(er); ++ return 0; ++} ++ ++static int tihtc_detect(struct gsmd *g) ++{ ++ /* FIXME: do actual detection of vendor if we have multiple vendors */ ++ /* open /proc/cpuinfo and check for HTC Magician or HTC Blueangel? */ ++ /* check for N_TIHTC ldisc? or set it ourselves? */ ++ return 1; ++} ++ ++static int tihtc_initsettings(struct gsmd *g) ++{ ++ int rc; ++ struct gsmd_atcmd *cmd; ++ ++ /* use %CGREG */ ++ //rc |= gsmd_simplecmd(g, "AT%CGREG=3"); ++ /* enable %CPRI: ciphering indications */ ++ rc |= gsmd_simplecmd(g, "AT%CPRI=1"); ++ /* enable %HTCCSQ: signal quality reports */ ++ rc |= gsmd_simplecmd(g, "AT%HTCCSQ=1"); ++ /* send unsolicited commands at any time */ ++ rc |= gsmd_simplecmd(g, "AT%CUNS=0"); ++ ++ /* enable %CPI: call progress indication */ ++ cmd = atcmd_fill("AT%CPI=?", 9, &cpi_detect_cb, g, 0); ++ if (cmd) ++ atcmd_submit(g, cmd); ++ ++ return rc; ++} ++ ++static struct gsmd_vendor_plugin plugin_tihtc = { ++ .name = "TI Calypso / HTC firmware", ++ .num_unsolicit = ARRAY_SIZE(tihtc_unsolicit), ++ .unsolicit = tihtc_unsolicit, ++ .detect = &tihtc_detect, ++ .initsettings = &tihtc_initsettings, ++}; ++ ++/* FIXME: this will be _init() when we make this a plugin */ ++int tihtc_init(void) ++{ ++ return gsmd_vendor_plugin_register(&plugin_tihtc); ++} +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-27 13:07:59.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-27 13:08:08.000000000 +0200 +@@ -276,7 +276,7 @@ + } + + /* FIXME: do this dynamically */ +- ticalypso_init(); ++ tihtc_init(); + + gsmd_vendor_plugin_find(&g); + +Index: gsm/src/gsmd/Makefile.am +=================================================================== +--- gsm.orig/src/gsmd/Makefile.am 2007-03-27 13:09:11.000000000 +0200 ++++ gsm/src/gsmd/Makefile.am 2007-03-27 13:09:20.000000000 +0200 +@@ -4,7 +4,7 @@ + sbin_PROGRAMS = gsmd + + gsmd_SOURCES = gsmd.c atcmd.c select.c vendor.c usock.c unsolicited.c log.c \ +- vendor_ti.c talloc.c operator_cache.c ext_response.c ++ vendor_ti.c vendor_tihtc.c talloc.c operator_cache.c ext_response.c + #gsmd_LDADD = ../libgsmd/libgsmd.la + #gsmd_LDFLAGS = -dynamic + diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 734624b3ff..d84d363f1a 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -11,6 +11,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://default" S = "${WORKDIR}/gsm" +SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ + file://ldisc.patch;patch=1" + inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "gsmd" -- cgit v1.2.3 From 0b25d92b900c10d66740b5cd37d000d2fcafc356 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 14:16:00 +0000 Subject: sapwood: fixed packaging, recreated patch --- packages/sapwood/sapwood/sockets.patch | 75 +++++++--------------------------- packages/sapwood/sapwood_svn.bb | 7 ++-- 2 files changed, 18 insertions(+), 64 deletions(-) diff --git a/packages/sapwood/sapwood/sockets.patch b/packages/sapwood/sapwood/sockets.patch index 1568206e2a..4e3a8e2d41 100644 --- a/packages/sapwood/sapwood/sockets.patch +++ b/packages/sapwood/sapwood/sockets.patch @@ -1,9 +1,12 @@ ---- configure.in.old 2005-06-10 17:04:52.000000000 +0200 -+++ configure.in 2005-06-10 17:20:47.000000000 +0200 -@@ -13,61 +13,61 @@ +Index: sapwood/configure.in +=================================================================== +--- sapwood.orig/configure.in 2007-03-29 16:04:12.000000000 +0200 ++++ sapwood/configure.in 2007-03-29 16:04:15.000000000 +0200 +@@ -13,63 +13,6 @@ + AC_PROG_INSTALL AC_PROG_MAKE_SET - dnl abstract sockets namespace checks, from dbus +-dnl abstract sockets namespace checks, from dbus -AC_ARG_ENABLE(abstract-sockets, - [AC_HELP_STRING([--enable-abstract-sockets], - [use abstract socket namespace (linux only)])], @@ -13,21 +16,12 @@ -AC_MSG_CHECKING(abstract socket namespace) -AC_RUN_IFELSE([AC_LANG_PROGRAM( -[[ -+#AC_ARG_ENABLE(abstract-sockets, -+# [AC_HELP_STRING([--enable-abstract-sockets], -+# [use abstract socket namespace (linux only)])], -+# [enable_abstract_sockets=$enableval], -+# [enable_abstract_sockets=no]) -+# -+#AC_MSG_CHECKING(abstract socket namespace) -+#AC_RUN_IFELSE([AC_LANG_PROGRAM( -+#[[ - #include - #include - #include - #include - #include - #include +-#include +-#include +-#include +-#include +-#include +-#include -]], -[[ - int listen_fd; @@ -68,46 +62,7 @@ -if test x$enable_abstract_sockets = xno; then - have_abstract_sockets=no -fi -+#]], -+#[[ -+# int listen_fd; -+# struct sockaddr_un addr; -+# -+# listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -+ -+# if (listen_fd < 0) -+# { -+# fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -+# exit (1); -+# } -+# -+# memset (&addr, '\0', sizeof (addr)); -+# addr.sun_family = AF_UNIX; -+# strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test"); -+# addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -+# -+# if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -+# { -+# fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -+# strerror (errno)); -+# exit (1); -+# } -+# else -+# exit (0); -+#]])], -+# [have_abstract_sockets=no], -+# [have_abstract_sockets=no]) -+#AC_MSG_RESULT($have_abstract_sockets) -+ -+#if test x$enable_abstract_sockets = xyes; then -+# if test x$have_abstract_sockets = xno; then -+# AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) -+# fi -+#fi -+ -+#if test x$enable_abstract_sockets = xno; then -+have_abstract_sockets=no -+#fi - +- if test x$have_abstract_sockets = xyes; then AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) + fi diff --git a/packages/sapwood/sapwood_svn.bb b/packages/sapwood/sapwood_svn.bb index 9651ff3916..39ccacb6f6 100644 --- a/packages/sapwood/sapwood_svn.bb +++ b/packages/sapwood/sapwood_svn.bb @@ -1,9 +1,8 @@ DESCRIPTION = "GTK theme engine Sapwood" LICENSE = "LGPL" - DEPENDS = "gtk+" - PV = "2.43+svn${SRCDATE}" +PR = "r1" SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \ file://sockets.patch;patch=1 \ @@ -20,5 +19,5 @@ do_install_append () { install -m755 ${S}/debian/sapwood-server.sh ${D}${sysconfdir}/osso-af-init/sapwood-server.sh } -FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/engines/" - +FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libsapwood.so" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug/libsapwood.so" -- cgit v1.2.3 From eb367035f82d95592a20b7c6c2aa73cbfd40394f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:17:12 +0000 Subject: magician: add N_TIHTC to handhelds-linux-2.6 defconfig and machine.conf --- conf/machine/magician.conf | 1 + packages/linux/linux-handhelds-2.6/magician/defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 02fdea6c59..4f62b5535b 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -40,6 +40,7 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ kernel-module-magician-phone \ + kernel-module-n-tihtc \ kernel-module-snd-soc-magician" # diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 55ce78a331..d542ccef14 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -748,6 +748,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_SA1100_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set +CONFIG_TIHTC=m # CONFIG_RAW_DRIVER is not set # -- cgit v1.2.3 From 8ad6ed721feab92844b72800b6e9a09430170dd9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:25:18 +0000 Subject: magician.conf: autoload n_tihtc.ko --- conf/machine/magician.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 4f62b5535b..719c9a5b03 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -54,6 +54,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" module_autoload_magician_ds1wm = "magician_ds1wm" module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" +module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" module_autoload_hci_usb = "hci_usb" -- cgit v1.2.3 From 9c9e5bcc93e10bdded1460e2bec0117185a708a3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:31:30 +0000 Subject: hx4700.conf: add voltage switching, bluetooth modules --- conf/machine/hx4700.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 482c8c0d8a..52eb09b933 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -35,8 +35,10 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ kernel-module-af-key \ kernel-module-i2c-pxa \ - kernel-module-hx4700-voltage \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ kernel-module-hx4700-acx \ + kernel-module-hx4700-bt \ kernel-module-snd-hx4700-audio" #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there -- cgit v1.2.3 From effaa4e341e06db4d82ad45c999a20d895b63cdd Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 29 Mar 2007 14:50:11 +0000 Subject: libgpewidget: Add 0.115 --- packages/libgpewidget/libgpewidget_0.115.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/libgpewidget/libgpewidget_0.115.bb diff --git a/packages/libgpewidget/libgpewidget_0.115.bb b/packages/libgpewidget/libgpewidget_0.115.bb new file mode 100644 index 0000000000..f679296c71 --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.115.bb @@ -0,0 +1,22 @@ +LICENSE = "LGPL" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools + +SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0" + +PACKAGES =+ "libgpewidget-bin" +FILES_libgpewidget-bin = "${bindir}/*" + +EXTRA_OECONF = "--enable-cairo" + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From 677e68b5c84389537e803c035b658dd18e845c45 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 14:58:04 +0000 Subject: php: dropped 4.3.6/4.3.10 --- packages/php/php-native_4.3.10.bb | 5 ----- packages/php/php-native_4.3.6.bb | 5 ----- packages/php/php_4.3.10.bb | 1 - packages/php/php_4.3.6.bb | 1 - 4 files changed, 12 deletions(-) delete mode 100644 packages/php/php-native_4.3.10.bb delete mode 100644 packages/php/php-native_4.3.6.bb delete mode 100644 packages/php/php_4.3.10.bb delete mode 100644 packages/php/php_4.3.6.bb diff --git a/packages/php/php-native_4.3.10.bb b/packages/php/php-native_4.3.10.bb deleted file mode 100644 index c90aa83c01..0000000000 --- a/packages/php/php-native_4.3.10.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "console/network" -require php_${PV}.bb -inherit native -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" -DEPENDS = "zlib-native" diff --git a/packages/php/php-native_4.3.6.bb b/packages/php/php-native_4.3.6.bb deleted file mode 100644 index c90aa83c01..0000000000 --- a/packages/php/php-native_4.3.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "console/network" -require php_${PV}.bb -inherit native -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" -DEPENDS = "zlib-native" diff --git a/packages/php/php_4.3.10.bb b/packages/php/php_4.3.10.bb deleted file mode 100644 index c15a9ee486..0000000000 --- a/packages/php/php_4.3.10.bb +++ /dev/null @@ -1 +0,0 @@ -require php.inc diff --git a/packages/php/php_4.3.6.bb b/packages/php/php_4.3.6.bb deleted file mode 100644 index c15a9ee486..0000000000 --- a/packages/php/php_4.3.6.bb +++ /dev/null @@ -1 +0,0 @@ -require php.inc -- cgit v1.2.3 From 036c369555a1f576bb9ebf4bbe960427221bb563 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 15:33:02 +0000 Subject: libgsmd: gsmd/magician: add patch to wait for the interpreter to be ready before sending --- .../gsm/files/magician/interpreter-ready.patch | 47 ++++++++++++++++++++++ packages/gsm/libgsmd_svn.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 packages/gsm/files/magician/interpreter-ready.patch diff --git a/packages/gsm/files/magician/interpreter-ready.patch b/packages/gsm/files/magician/interpreter-ready.patch new file mode 100644 index 0000000000..cc6b9c6e2b --- /dev/null +++ b/packages/gsm/files/magician/interpreter-ready.patch @@ -0,0 +1,47 @@ +Index: gsm/include/gsmd/gsmd.h +=================================================================== +--- gsm.orig/include/gsmd/gsmd.h 2007-03-29 17:07:10.000000000 +0200 ++++ gsm/include/gsmd/gsmd.h 2007-03-29 17:07:43.000000000 +0200 +@@ -58,6 +58,7 @@ + + struct gsmd { + unsigned int flags; ++ int interpreter_ready; + struct gsmd_fd gfd_uart; + struct gsmd_fd gfd_sock; + struct llparser llp; +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-03-29 17:06:01.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-03-29 17:08:27.000000000 +0200 +@@ -183,6 +183,7 @@ + * an empty string or that 'ready' string, we need to init the modem */ + if (strlen(buf) == 0 || + !strcmp(buf, "AT-Command Interpreter ready")) { ++ g->interpreter_ready = 1; + gsmd_initsettings(g); + return 0; + } +@@ -372,7 +373,7 @@ + } + + /* write pending commands to UART */ +- if (what & GSMD_FD_WRITE) { ++ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { + struct gsmd_atcmd *pos, *pos2; + llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { + len = strlen(pos->buf); +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-29 17:06:04.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-29 17:08:59.000000000 +0200 +@@ -291,7 +291,8 @@ + + gsmd_vendor_plugin_find(&g); + +- gsmd_initsettings(&g); ++ if (g.interpreter_ready) ++ gsmd_initsettings(&g); + + gsmd_opname_init(&g); + diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index d84d363f1a..910fa26d4d 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -12,6 +12,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ + file://interpreter-ready.patch;patch=1 \ file://ldisc.patch;patch=1" inherit autotools pkgconfig update-rc.d -- cgit v1.2.3 From 2e8c09716712fdd9ea2c8f373259d18dec1901b0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 15:57:34 +0000 Subject: angstrom: prefer gcc 4.1.2 as native compiler (cross versions are still 4.1.1) --- conf/distro/angstrom-2007.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 59a65de663..37d2f1b9df 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "38" +DISTRO_REVISION = "39" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -195,7 +195,7 @@ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "ucli PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" #use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc ?= "4.1.2" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -- cgit v1.2.3 From dda4b24a56b3eb979d3bd473044d5277a7296461 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 17:07:21 +0000 Subject: libx11-1.1.1: fix packaging --- packages/xorg-lib/libx11_1.1.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 07e0286a13..45f524df58 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,5 +1,6 @@ require xorg-lib-common.inc PE = "1" +PR = "r1" DESCRIPTION = "Base X libs." @@ -10,8 +11,11 @@ RPROVIDES = "virtual/libx11" XORG_PN = "libX11" +PACKAGES =+ "libx11-xcb" + FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" +FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*" do_compile() { ( -- cgit v1.2.3 From 3e7a625b0563f0163a9b41969764b35ac68e88b3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 18:09:55 +0000 Subject: xserver-kdrive-1.2.0: missing optional-xkb.patch --- .../xserver-kdrive-1.2.0/optional-xkb.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch new file mode 100644 index 0000000000..a580b500b7 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch @@ -0,0 +1,58 @@ +Index: xorg-server-1.2.0/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/Makefile.am 2007-03-28 20:26:19.000000000 +0200 +@@ -30,6 +30,10 @@ + XINPUT_DIR=Xi + endif + ++if XKB ++XKB_DIR=xkb ++endif ++ + if DBE + DBE_DIR=dbe + endif +@@ -46,7 +50,7 @@ + randr \ + render \ + $(XINPUT_DIR) \ +- xkb \ ++ $(XKB_DIR) \ + $(DBE_DIR) \ + $(MFB_DIR) \ + $(AFB_DIR) \ +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-01-23 06:39:15.000000000 +0100 ++++ xorg-server-1.2.0/configure.ac 2007-03-28 20:27:13.000000000 +0200 +@@ -428,6 +428,7 @@ + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) + AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) + AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) ++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) + + dnl DDXes. + AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) +@@ -754,12 +755,15 @@ + + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +-AC_DEFINE(XKB, 1, [Build XKB]) +-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +-XKB_LIB='$(top_builddir)/xkb/libxkb.la' +-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) ++if test "x$XKB" = xyes; then ++ AC_DEFINE(XKB, 1, [Build XKB]) ++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) ++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" ++ XKB_LIB='$(top_builddir)/xkb/libxkb.la' ++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++fi + + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, + [Do not have `strcasecmp'.])) -- cgit v1.2.3 From 22e75d829f89c309957e96fe2e61ddb8f7b977f4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 18:16:05 +0000 Subject: kdrive 1.2: rediff optional-xkb.patch --- .../xserver-kdrive-1.2.0/optional-xkb.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch new file mode 100644 index 0000000000..7efc70820f --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch @@ -0,0 +1,54 @@ +--- /tmp/bar/Makefile.am 2007-03-29 20:12:38.000000000 +0200 ++++ xorg-server-1.2.0/Makefile.am 2007-03-29 20:12:49.325251000 +0200 +@@ -30,6 +30,10 @@ + XINPUT_DIR=Xi + endif + ++if XKB ++XKB_DIR=xkb ++endif ++ + if DBE + DBE_DIR=dbe + endif +@@ -46,7 +50,7 @@ + randr \ + render \ + $(XINPUT_DIR) \ +- xkb \ ++ $(XKB_DIR) \ + $(DBE_DIR) \ + $(MFB_DIR) \ + $(AFB_DIR) \ +--- /tmp/bar/configure.ac 2007-03-29 20:12:38.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-29 20:12:49.325251000 +0200 +@@ -428,6 +428,7 @@ + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) + AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) + AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) ++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) + + dnl DDXes. + AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) +@@ -754,12 +755,15 @@ + + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +-AC_DEFINE(XKB, 1, [Build XKB]) +-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +-XKB_LIB='$(top_builddir)/xkb/libxkb.la' +-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) ++if test "x$XKB" = xyes; then ++ AC_DEFINE(XKB, 1, [Build XKB]) ++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) ++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" ++ XKB_LIB='$(top_builddir)/xkb/libxkb.la' ++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++fi + + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, + [Do not have `strcasecmp'.])) -- cgit v1.2.3 From c9fb0e6b677050e621003e6d1b47d5e44b7ef5ba Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 18:24:58 +0000 Subject: disapproval of revision '3747999334cad4bb22159396976a802d18c50703' --- .../xserver-kdrive-1.2.0/optional-xkb.patch | 54 ---------------------- 1 file changed, 54 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch deleted file mode 100644 index 7efc70820f..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- /tmp/bar/Makefile.am 2007-03-29 20:12:38.000000000 +0200 -+++ xorg-server-1.2.0/Makefile.am 2007-03-29 20:12:49.325251000 +0200 -@@ -30,6 +30,10 @@ - XINPUT_DIR=Xi - endif - -+if XKB -+XKB_DIR=xkb -+endif -+ - if DBE - DBE_DIR=dbe - endif -@@ -46,7 +50,7 @@ - randr \ - render \ - $(XINPUT_DIR) \ -- xkb \ -+ $(XKB_DIR) \ - $(DBE_DIR) \ - $(MFB_DIR) \ - $(AFB_DIR) \ ---- /tmp/bar/configure.ac 2007-03-29 20:12:38.000000000 +0200 -+++ xorg-server-1.2.0/configure.ac 2007-03-29 20:12:49.325251000 +0200 -@@ -428,6 +428,7 @@ - AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) - AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) - AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) -+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) - - dnl DDXes. - AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -@@ -754,12 +755,15 @@ - - AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) - --AC_DEFINE(XKB, 1, [Build XKB]) --AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) --AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) --REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" --XKB_LIB='$(top_builddir)/xkb/libxkb.la' --XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) -+if test "x$XKB" = xyes; then -+ AC_DEFINE(XKB, 1, [Build XKB]) -+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) -+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" -+ XKB_LIB='$(top_builddir)/xkb/libxkb.la' -+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+fi - - AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, - [Do not have `strcasecmp'.])) -- cgit v1.2.3 From 77140a739890f8d17d2b3b762c71f69fcf3baeae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 18:53:10 +0000 Subject: gpe-sessionscripts: remove PV in depends --- packages/gpe-session-scripts/gpe-session-scripts_0.67.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index 3596e4e6cd..4d68bc11a0 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -4,14 +4,14 @@ DESCRIPTION = "GPE session startup scripts" LICENSE = "GPL" SECTION = "gpe" PRIORITY = "optional" -RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" +RDEPENDS_${PN} = "matchbox-panel matchbox-desktop matchbox-common gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" # more rdepends: keylaunch apmd blueprobe DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings" -PR = "r7" +PR = "r8" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" -- cgit v1.2.3 From 51800bbfd42a890cb2f1d974aa5904c50ca497e0 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 29 Mar 2007 19:23:07 +0000 Subject: task-sdk: Update various bits to current names. --- packages/tasks/task-sdk.bb | 49 +++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index a9814d51a1..cbd1ab72f1 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r5" +PR = "r6" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -21,73 +21,67 @@ RDEPENDS_task-sdk-base := "\ glibc-dev \ libgcc1 \ alsa-dev \ - audiofile-dev \ - bluez-libs-dev \ + libaudiofile-dev \ + libbluetooth-dev \ dbus-dev \ expat-dev \ fontconfig-dev \ freetype-dev \ - glib-2.0-dev \ + libglib-2.0-dev \ gstreamer-dev \ libice-dev \ ipkg-dev \ - jpeg-dev \ + libjpeg-dev \ libapm-dev \ - libasound \ + libasound2 \ libdisplaymigration-dev \ libetpan-dev \ libgcrypt-dev \ - libglade-dev \ - gnutls-dev \ + libglade-2.0-dev \ + libgnutls-dev \ libgpg-error-dev \ - libidl-dev \ + libidl-2-dev \ libiw-dev \ - libmimedir-dev \ + libmimedir-0.4-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ libschedule-dev \ libsm-dev \ libsoundgen-dev \ - libsoup-dev \ + libsoup-2.2-dev \ libsvg-dev \ libtododb-dev \ libts-dev \ libxml2-dev \ ncurses-dev \ - openobex-dev \ - popt-dev \ - readline-dev \ - sqlite-dev \ + libopenobex-dev \ + libpopt-dev \ + libreadline-dev \ + libsqlite-dev \ zlib-dev \ libxmu-dev" RDEPENDS_task-sdk-x11 := "\ - atk-dev \ - cairo-dev \ + libatk-1.0-dev \ + libcairo-dev \ gconf-dbus-dev \ gtk+-dev \ gtk-engines-dev \ libsvg-cairo-dev \ - libmatchbox-dev \ + libmb-dev \ matchbox-desktop-dev \ pango-dev \ - startup-notification-dev" + libstartup-notification-1-dev" RDEPENDS_task-sdk-x11-ext := "\ - compositeext-dev \ - damageext-dev \ - fixesext-dev \ libxcursor-dev \ libxdmcp-dev \ - libxfixes-dev \ libxft-dev \ libxrandr-dev \ libxrender-dev \ libxsettings-client-dev \ randrext-dev \ - recordext-dev \ - renderext-dev \ resourceext-dev \ libx11-dev \ libxau-dev \ @@ -103,14 +97,15 @@ RDEPENDS_task-sdk-x11-ext := "\ libxt-dev \ xtrans-dev \ libxtst-dev" -# libxss-dev \ + RDEPENDS_task-sdk-gpe := "\ libcontactsdb-dev \ - esound-dev \ + libesd-dev \ libeventdb-dev \ libgpepimc-dev \ libgpevtype-dev \ libgpelaunch-dev \ libgpewidget-dev \ libhandoff-dev" + -- cgit v1.2.3 From d0f8d7d128418e126277a516e614066f089adfac Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 29 Mar 2007 19:35:16 +0000 Subject: meta-sdk-sbox: Start of a scratchbox based SDK. Currently creates a rootstrap which can be used after importing the crosscompiler. Compiling seems to work but running applications doesn't. --- packages/meta/meta-sdk-sbox.bb | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 packages/meta/meta-sdk-sbox.bb diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb new file mode 100644 index 0000000000..4e3151805e --- /dev/null +++ b/packages/meta/meta-sdk-sbox.bb @@ -0,0 +1,115 @@ +DESCRIPTION = "Meta package for a Scratchbox SDK" +LICENSE = "MIT" +PR = "r0" + +PACKAGES = "" +PACKAGES = "" + +inherit sdk debian + +SDK_DIR = "${WORKDIR}/sdk" +SDK_OUTPUT = "${SDK_DIR}/image" +SDK_DEPLOY = "${TMPDIR}/deploy/sdk" +prefix = "/" +exec_prefix = "${prefix}" +base_prefix = "${exec_prefix}" +FILES_${PN} = "${prefix}" + +TARGET_INSTALL = "\ + task-sdk-base \ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe" + +DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +RDEPENDS = "${TARGET_INSTALL}" +BUILD_ALL_DEPS = "1" + + +IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" + +ipk_do_indexes () { + set -x + + ipkgarchs="${PACKAGE_ARCHS}" + + if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + touch ${DEPLOY_DIR_IPK}/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} + fi + + for arch in $ipkgarchs; do + if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then + touch ${DEPLOY_DIR_IPK}/$arch/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ + fi + fi + done +} + +do_populate_sdk() { + ipk_do_indexes + + rm -rf ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + cat <${SDK_DIR}/ipkg-target.conf +src oe file:${DEPLOY_DIR_IPK} +EOF + ipkgarchs="${PACKAGE_ARCHS}" + priority=1 + for arch in $ipkgarchs; do + echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf + priority=$(expr $priority + 5) + if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then + echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf + fi + done + + rm -r ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + ${IPKG_TARGET} update + ${IPKG_TARGET} install ${TARGET_INSTALL} + + mkdir -p ${SDK_OUTPUT}/${prefix}/usr/include + #cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + #rm -rf ${SDK_OUTPUT}/${prefix}/usr/ + + #cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib + #rm -rf ${SDK_OUTPUT}/${prefix}/lib/* + + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/ + chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/ + find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x + + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libc.so + # remove unwanted housekeeping files + mv ${SDK_OUTPUT}${libdir}/../*/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + rm -rf ${SDK_OUTPUT}${libdir}/ipkg + + # remove unwanted executables + rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc + + # remove broken .la files + #rm ${SDK_OUTPUT}/${prefix}/lib/*.la + + # fix pkgconfig data files + cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig + #for f in *.pc ; do + # sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" + #done + for f in *.pc ; do + sed -i 's%${STAGING_DIR}%/usr/%g' "$f" + done + + mkdir -p ${SDK_DEPLOY} + cd ${SDK_OUTPUT} + fakeroot tar cfz ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-sbox-sdk-${DATE}.tar.gz . +} + +do_populate_sdk[nostamp] = "1" +addtask populate_sdk before do_build after do_install -- cgit v1.2.3 From a5ab4c711b23d99dd9d252d5c08fa60dd76c493d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 19:54:51 +0000 Subject: meta-sdk-sbox: remove hardcodes references, reuse functions instead of copy-pasting them, and we have an SCM, so no need to comment stuff --- packages/meta/meta-sdk-sbox.bb | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 4e3151805e..cf399644e3 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,15 +1,14 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" -PR = "r0" +PR = "r1" -PACKAGES = "" PACKAGES = "" -inherit sdk debian +inherit rootfs_ipk sdk debian SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${TMPDIR}/deploy/sdk" +SDK_DEPLOY = "${DEPLOY_DIR}/sdk" prefix = "/" exec_prefix = "${prefix}" base_prefix = "${exec_prefix}" @@ -28,28 +27,11 @@ BUILD_ALL_DEPS = "1" IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" -ipk_do_indexes () { - set -x - - ipkgarchs="${PACKAGE_ARCHS}" - - if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - touch ${DEPLOY_DIR_IPK}/Packages - ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} - fi - - for arch in $ipkgarchs; do - if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then - touch ${DEPLOY_DIR_IPK}/$arch/Packages - ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ - fi - fi - done -} - do_populate_sdk() { - ipk_do_indexes + + set -ex + rootfs_ipk_do_indexes + set +ex rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} @@ -99,9 +81,6 @@ EOF # fix pkgconfig data files cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig - #for f in *.pc ; do - # sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" - #done for f in *.pc ; do sed -i 's%${STAGING_DIR}%/usr/%g' "$f" done -- cgit v1.2.3