diff options
59 files changed, 278 insertions, 1159 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 685633cdd8..82314a8f22 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD, CF, USB-Storage and NFS. \ -Tested machines: Collie, Poodle, Akita, Spitz, C7x0, Tosa" +Tested machines: Collie, Poodle, Akita, Spitz, C7x0, Tosa, Borzoi" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r29" +PR = "r33" SRC_URI = "file://altboot-menu \ @@ -44,75 +44,6 @@ pkg_postinst() { update-alternatives --install /sbin/init init /sbin/init.altboot 55 } -pkg_postinst_spitz() { - # Note: Spitz support is a royal pain in the ass. - # Since Spitz pivot_roots by default, there is no real way - # a user can install an altboot.ipk into the flash FS. - # So we need to do that manually (*SIGH*) - - # the 2.6 kernel for spitz boots from HDD, no need to copy to flash - if cat /proc/version | awk '{print $3}' | grep -q '^2.6'; then - update-alternatives --install /sbin/init init /sbin/init.altboot 55 - # no need to copy to flash if we're installing to flash already - elif mount | grep ' / ' | grep -q mtdblock; then - update-alternatives --install /sbin/init init /sbin/init.altboot 55 - else - # /l/m only exists on the HDD on spitz - if test -d /lib/modules - then - if [ -e /media/realroot/sbin/init ]; then - ROOT_MOUNT_POINT="/media/realroot" - elif [ -e /media/ROM/sbin/init ]; then - ROOT_MOUNT_POINT="/media/ROM" - fi - if [ ! "$ROOT_MOUNT_POINT" = "" ]; then - ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` - if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then - mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT - cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc - cp /sbin/init.altboot $ROOT_MOUNT_POINT/sbin - if [ -f $ROOT_MOUNT_POINT/sbin/init ]; then - mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig - fi - ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init - fi - fi - fi - fi -} - pkg_postrm() { update-alternatives --remove init /sbin/init.altboot } - -pkg_postrm_spitz() { - # the 2.6 kernel for spitz boots from HDD, no need to remove from flash - if cat /proc/version | awk '{print $3}' | grep -q '^2.6'; then - update-alternatives --remove init /sbin/init.altboot - # no need to copy to flash if we're removing from flash already - elif mount | grep ' / ' | grep -q mtdblock; then - update-alternatives --remove init /sbin/init.altboot - else - if test -d /lib/modules - then - if [ -e /media/realroot/sbin/init ]; then - ROOT_MOUNT_POINT="/media/realroot" - elif [ -e /media/ROM/sbin/init ]; then - ROOT_MOUNT_POINT="/media/ROM" - fi - if [ ! "$ROOT_MOUNT_POINT" = "" ]; then - ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` - if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then - mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT - if [ -f $ROOT_MOUNT_POINT/sbin/init.orig ]; then - rm $ROOT_MOUNT_POINT/sbin/init - rm $ROOT_MOUNT_POINT/sbin/init.altboot - mv $ROOT_MOUNT_POINT/sbin/init.orig $ROOT_MOUNT_POINT/sbin/init - else - echo "$ROOT_MOUNT_POINT/sbin/init.orig not found, not uninstalling altboot!" - fi - fi - fi - fi - fi -} diff --git a/packages/altboot/altboot_1.0.6-rc1.bb b/packages/altboot/altboot_1.0.6-rc1.bb new file mode 100644 index 0000000000..bb99fe31e5 --- /dev/null +++ b/packages/altboot/altboot_1.0.6-rc1.bb @@ -0,0 +1,82 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (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 <oe@hentges.net>" +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" + +###################################################################################### + +PR = "r0" + +###################################################################################### + +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" + +S = "${WORKDIR}/altboot/" + +###################################################################################### + +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 + + if test -d ${WORKDIR}/altboot/${MACHINE} + then + install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc + else + install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc + fi + + install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc + install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin + + if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ + then + install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + else + install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + fi + + if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/ + then + install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + else + install -m 0755 ${WORKDIR}/altboot/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 +} + +###################################################################################### + +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 +} + +###################################################################################### + +pkg_postinst() { + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm() { + update-alternatives --remove init /sbin/init.altboot +} + diff --git a/packages/altboot/files/borzoi/altboot-2.4.cfg b/packages/altboot/files/borzoi/altboot-2.4.cfg deleted file mode 100644 index 8c404d4768..0000000000 --- a/packages/altboot/files/borzoi/altboot-2.4.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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/init.altboot b/packages/altboot/files/init.altboot index 665b3fa4b5..ed95ce1c9c 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -8,7 +8,7 @@ test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" CURRENT_ENV="`set`" -VERSION="0.0.4" +VERSION="DEVELOPER SNAPSHOT" # Set some defaults in case altboot.cfg is missing REAL_INIT="/sbin/init.sysvinit" @@ -243,9 +243,13 @@ wait_for_input() { # above to launch the altboot menu. - # This filters an "<ENTER>" from the user as "any key" - ( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 & - sleep 1; kill $! + # Bash throws an ugly error on kill + if ! (readlink /bin/sh | grep -q bash) + then + # This filters an "<ENTER>" from the user as "any key" + ( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 & + sleep 1; kill $! >/dev/null 2>&1 + fi @@ -280,7 +284,7 @@ wait_for_input() { # * * * * * * This is the main function * * * * * * -if test "`runlevel`" != "unknown" -a "$1" != "-force" +if test -f /proc/cmdline -a "$1" != "-force" then echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1 exec $REAL_INIT $* diff --git a/packages/altboot/files/spitz/altboot-2.4.cfg b/packages/altboot/files/spitz/altboot-2.4.cfg deleted file mode 100644 index 3c8abc9bae..0000000000 --- a/packages/altboot/files/spitz/altboot-2.4.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# -# Handled by /sbin/init.altboot -# Allow booting images from SD, CF or RAM instead of booting -# the ROM. This is currently broken. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext3" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/media/hdd/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" - -HDD3_DEVICE="/dev/hda3" -HDD3_MOUNTPOINT="/media/hdd3" -HDD3_TYPE="vfat" - -SPITZ_HDD_PART="/dev/hda1" -SPITZ_HDD_TYPE="ext3" - diff --git a/packages/altboot/files/borzoi/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg index 69f7c8351b..69f7c8351b 100644 --- a/packages/altboot/files/borzoi/altboot-2.6.cfg +++ b/packages/altboot/files/spitz/altboot-2.6.cfg diff --git a/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty b/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty +++ /dev/null diff --git a/packages/altboot/files/spitz/altboot-menu/00-Default b/packages/altboot/files/spitz/altboot-menu/00-Default deleted file mode 100644 index 01818262a3..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/00-Default +++ /dev/null @@ -1,54 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - -# Note for Spitz: The HDD has already been mounted in /media/hdd from -# /etc/altboot.rc/00-Default.sh - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1" - echo "Spitz: Mounting [$SPITZ_HDD_PART] as /media/hdd" - mount -t proc proc /proc || echo "Mounting /proc failed!" - - mount -o remount,rw / - - # Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - check_fs $SPITZ_HDD_PART $SPITZ_HDD_TYPE - if [ "$SPITZ_HDD_TYPE" = "" ]; then - SPITZ_HDD_TYPE="auto" - fi - - # I've seen busybox die a horrible death on "!"... - if (mount -t $SPITZ_HDD_TYPE $SPITZ_HDD_PART /media/hdd) - then - a=a - else - echo "ERROR: mount -t ext3 $SPITZ_HDD_PART /media/hdd failed!" - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - fi - - # There are no device files on Spitz yet, requires HDD (bad for testing - # with CF) - for n in 0 1 2 3 4 5 - do - ! test -e /dev/loop$n && mknod /dev/loop$n b 7 $n - done - - # Check for /sbin/init and / or loop-images - check_target "/media/hdd" 5 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/10-noGui b/packages/altboot/files/spitz/altboot-menu/10-noGui deleted file mode 100644 index e4e8b0fe37..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/10-noGui +++ /dev/null @@ -1,47 +0,0 @@ -# !/bin/sh -M_TITLE="Don't launch GUI" - - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1" - echo "Spitz: Mounting [$SPITZ_HDD_PART] as /media/hdd" - mount -t proc proc /proc || echo "Mounting /proc failed!" - - mount -o remount,rw / - - # Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - # I've seen busybox die a horrible death on "!"... - if (mount -t auto $SPITZ_HDD_PART /media/hdd) - then - a=a - else - echo "ERROR: mount -t ext3 $SPITZ_HDD_PART /media/hdd failed!" - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - fi - - # There are no device files on Spitz yet, requires HDD (bad for testing - # with CF) - for n in 1 2 3 4 5 - do - ! test -e /dev/loop$n && mknod /dev/loop$n b 7 $n - done - - # Check for /sbin/init and / or loop-images - check_target "/media/hdd" 2 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/15-bootSD b/packages/altboot/files/spitz/altboot-menu/15-bootSD deleted file mode 100644 index d22316033c..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/15-bootSD +++ /dev/null @@ -1,64 +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" - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# 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!" - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1" - mount -t proc proc /proc || echo "Mounting /proc failed!" - - # Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - # I've seen busybox die a horrible death on "!"... - if (mount -t auto $SPITZ_HDD_PART /media/hdd) - then - a=a - else - echo "ERROR: mount -t auto $SPITZ_HDD_PART /media/hdd failed!" - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - fi - -# echo -n "Generating device files..." >/dev/tty0 -# /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - -# FIXME: generate device-files - - 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 - - # 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/spitz/altboot-menu/20-bootCF b/packages/altboot/files/spitz/altboot-menu/20-bootCF deleted file mode 100644 index 3f19b4ee48..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/20-bootCF +++ /dev/null @@ -1,49 +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) - -# FXIME: boot CF on spitz (hdb??) -exit 0 - -M_TITLE="Boot CF card" - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# 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!" - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - - echo -n "Mounting /proc..." >/dev/tty0 - mount /proc >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount /proc failed!" - - /etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - - # 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/spitz/altboot-menu/25-bootHDD3 b/packages/altboot/files/spitz/altboot-menu/25-bootHDD3 deleted file mode 100644 index 4280cdd35c..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/25-bootHDD3 +++ /dev/null @@ -1,80 +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="Boot from images on HDD3" - -# 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. - - -# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT -# correctly. -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# 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 - - ########################################## - - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - #echo -n "Generating device files..." >/dev/tty0 - #/etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - check_fs $HDD3_DEVICE $HDD3_TYPE - - echo -n "Mounting $HDD3_MOUNTPOINT..." >/dev/tty0 - if [ "$HDD3_TYPE" = "" ]; then - HDD3_TYPE="auto" - fi - /bin/mount -t $HDD3_TYPE -o defaults,noatime $HDD3_DEVICE $HDD3_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $HDD3_DEVICE $HDD3_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 "$HDD3_MOUNTPOINT" >/dev/tty0 - - # Done :) - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac diff --git a/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example b/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example deleted file mode 100644 index 61c0645176..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example +++ /dev/null @@ -1,81 +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. - - -# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT -# correctly. -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# 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 - - ########################################## - - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - - 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/spitz/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty +++ /dev/null diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 6cac410019..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,97 +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) - -# FIXME: Make this work - -M_TITLE="Boot from NFS" - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# 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!" - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - echo -n "Mounting /proc..." >/dev/tty0 - mount /proc >/dev/tty0 2>&1 && echo ok >/dev/tty0 || echo failed - - # Needed for NFS - /etc/init.d/portmap start >/dev/tty1 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 to lazy to investigate ;) - /etc/init.d/networking start || die "/etc/init.d/networking start failed!" - - sleep 2 - - # After the PCMCIA service is started, an inserted WLAN card should automatically - # activate itself. - /etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!" - - # Give WLAN time to login into the network - echo "Waiting for WLAN..." - sleep 8 - - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - 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 - echo -n "Boot NFS root: " - read junk < /dev/tty1 - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - 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 || die "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" - - check_target "/media/nfsroot" - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh deleted file mode 100644 index 6db4adaf3a..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh +++ /dev/null @@ -1,23 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - - -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 - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb deleted file mode 100644 index 18ad005092..0000000000 --- a/packages/evince/evince_0.3.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Evince is simply a document viewer" -LICENSE = "GPL" -DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" -RDEPENDS = "espgs gconf" -RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r1" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.3/${PN}-${PV}.tar.bz2 \ - file://no-doc.patch;patch=1" - -EXTRA_OECONF = "--disable-tiff" - -inherit gnome pkgconfig - - diff --git a/packages/evince/evince_0.5.1.bb b/packages/evince/evince_0.5.1.bb deleted file mode 100644 index a772bb2de5..0000000000 --- a/packages/evince/evince_0.5.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Evince is simply a document viewer" -LICENSE = "GPL" -DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" -RDEPENDS = "espgs gconf" -RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r0" - -inherit gnome pkgconfig - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.5/${PN}-${PV}.tar.bz2 \ - file://more-no-doc.patch;patch=1" - -EXTRA_OECONF = "--disable-tiff" - diff --git a/packages/evince/evince_0.5.0.bb b/packages/evince/evince_0.5.2.bb index a772bb2de5..a772bb2de5 100644 --- a/packages/evince/evince_0.5.0.bb +++ b/packages/evince/evince_0.5.2.bb diff --git a/packages/gnome/goffice_0.0.1.bb b/packages/gnome/goffice_0.0.1.bb deleted file mode 100644 index eabe184e36..0000000000 --- a/packages/gnome/goffice_0.0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r1" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - - diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.0.2.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.0.3.bb b/packages/gnome/goffice_0.0.3.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.0.4.bb b/packages/gnome/goffice_0.0.4.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.1.0.bb b/packages/gnome/goffice_0.1.0.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.1.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.1.2.bb b/packages/gnome/goffice_0.1.2.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.1.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.2.0.bb b/packages/gnome/goffice_0.2.0.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/orbit2-native_2.14.0.bb b/packages/gnome/orbit2-native_2.14.0.bb new file mode 100644 index 0000000000..c10afb58db --- /dev/null +++ b/packages/gnome/orbit2-native_2.14.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "CORBA ORB" +LICENSE = "LGPL GPL" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \ + file://configure-lossage.patch;patch=1;pnum=1 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "libidl-native popt-native gtk-doc" + +S = "${WORKDIR}/ORBit2-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/orbit2" + +PARALLEL_MAKE = "" +inherit autotools native pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_prepend() { + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ + install ${WORKDIR}/gtk-doc.make ./ +} diff --git a/packages/altboot/files/borzoi/.mtn2git_empty b/packages/gnome/orbit2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/altboot/files/borzoi/.mtn2git_empty +++ b/packages/gnome/orbit2/.mtn2git_empty diff --git a/packages/gnome/orbit2/configure-lossage.patch b/packages/gnome/orbit2/configure-lossage.patch new file mode 100644 index 0000000000..7485a0ce0c --- /dev/null +++ b/packages/gnome/orbit2/configure-lossage.patch @@ -0,0 +1,35 @@ +--- orbit/configure.in~ 2004-05-07 09:31:32.000000000 +0100 ++++ orbit/configure.in 2004-05-08 19:27:35.000000000 +0100 +@@ -193,19 +193,19 @@ + dnl So many people with broken linking setups asked about this + dnl it turned out to be necessary to check for this. + dnl +-dofus_save_libs="$LIBS" +-LIBS="$ORBIT_LIBS $LIBS" +-AC_TRY_RUN([ #include <stdio.h> +- main () +- { +- return 0; +- } ],, +- AC_MSG_ERROR([ +-Linking is badly borked on your system. Please ensure your library path is correct +-Check config.log for details - check near the end of the log above 'failed program was' +-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the +-prefix you're compiling on: '${prefix}' ])) +-LIBS="$dofus_save_libs" ++dnl dofus_save_libs="$LIBS" ++dnl LIBS="$ORBIT_LIBS $LIBS" ++dnl AC_TRY_RUN([ #include <stdio.h> ++dnl main () ++dnl { ++dnl return 0; ++dnl } ],, ++dnl AC_MSG_ERROR([ ++dnl Linking is badly borked on your system. Please ensure your library path is correct ++dnl Check config.log for details - check near the end of the log above 'failed program was' ++dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the ++dnl prefix you're compiling on: '${prefix}' ])) ++dnl LIBS="$dofus_save_libs" + + orig_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" diff --git a/packages/gnome/orbit2_2.14.0.bb b/packages/gnome/orbit2_2.14.0.bb new file mode 100644 index 0000000000..008ec2c7b3 --- /dev/null +++ b/packages/gnome/orbit2_2.14.0.bb @@ -0,0 +1,46 @@ +LICENSE = "GPL" +PR = "r2" +DESCRIPTION = "CORBA ORB" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ + file://configure-lossage.patch;patch=1;pnum=1 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "libidl popt orbit2-native gtk-doc" + +FILES_${PN} += "${libdir}/orbit-2.0/*.so" + +S = "${WORKDIR}/ORBit2-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" +EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'" + +do_configure_prepend() { + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ + install ${WORKDIR}/gtk-doc.make ./ +} + +do_compile_append () { + sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new + mv ORBit-2.0.pc.new ORBit-2.0.pc +} + +do_stage() { + oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR} + install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/ + + for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do + install -d ${STAGING_INCDIR}/orbit-2.0/$dir + ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done ) + done + + install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices + install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ + install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ + install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ +} diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty b/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty +++ /dev/null diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch deleted file mode 100644 index fe06e2bae3..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch +++ /dev/null @@ -1,11 +0,0 @@ -+++ Makefile.am 2004-04-07 15:47:04.000000000 +0100 ---- Makefile.am.orig 2004-07-23 18:03:34.000000000 +0100 -@@ -44,7 +44,7 @@ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ -+# xmldocs.make \ -- xmldocs.make \ - omf.make \ - $(server_in_files) $(server_DATA) - diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch deleted file mode 100644 index 08ce8e1ee2..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch +++ /dev/null @@ -1,11 +0,0 @@ -+++ gnumeric-doc.make 2004-03-31 02:32:25.000000000 +0100 ---- gnumeric-doc.make.orig 2004-07-26 15:51:43.000000000 +0100 -@@ -24,7 +24,7 @@ - include $(top_srcdir)/xmldocs.make - - # include generated files to simplify installation --EXTRA_DIST += \ -+EXTRA_DIST = \ - func.defs \ - functions.xml \ - func-header.xml func-footer.xml diff --git a/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty b/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty +++ /dev/null diff --git a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch b/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch deleted file mode 100644 index 2fbd71ceaf..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnumeric/src/workbook-control-gui-priv.h.orig 2004-07-19 07:06:18.000000000 +0100 -+++ gnumeric/src/workbook-control-gui-priv.h 2004-07-28 00:15:46.000000000 +0100 -@@ -111,7 +111,7 @@ - void wbcg_insert_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); - void wbcg_append_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); - void wbcg_set_selection_halign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign); --void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign); -+void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleVAlignFlags halign); - - enum { - WBCG_MARKUP_CHANGED, diff --git a/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty +++ /dev/null diff --git a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch deleted file mode 100644 index 4a9108bd4e..0000000000 --- a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000 -+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000 -@@ -1,4 +1,4 @@ --SUBDIRS = . po po-functions src plugins icons templates doc schemas -+SUBDIRS = . po po-functions src plugins icons templates schemas - if WITH_WIN32 - SUBDIRS += tools - endif diff --git a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty +++ /dev/null diff --git a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch deleted file mode 100644 index 4a9108bd4e..0000000000 --- a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000 -+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000 -@@ -1,4 +1,4 @@ --SUBDIRS = . po po-functions src plugins icons templates doc schemas -+SUBDIRS = . po po-functions src plugins icons templates schemas - if WITH_WIN32 - SUBDIRS += tools - endif diff --git a/packages/gnumeric/gnumeric_1.3.1.bb b/packages/gnumeric/gnumeric_1.3.1.bb deleted file mode 100644 index 299c36cbb2..0000000000 --- a/packages/gnumeric/gnumeric_1.3.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r3" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += 'file://workbook-control-gui-priv.h.patch;patch=1' - -EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` ' - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.3.1.cvs.bb b/packages/gnumeric/gnumeric_1.3.1.cvs.bb deleted file mode 100644 index 6bbbf645c4..0000000000 --- a/packages/gnumeric/gnumeric_1.3.1.cvs.bb +++ /dev/null @@ -1,30 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -#SRCDATE="20040719" -CVSTAG="GNUMERIC_1_3_1" - -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/gnumeric" - - -PR = "r1" -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gnumeric;tag=${CVSTAG} \ - file://gnumeric-doc.make.patch;patch=1 \ - file://Makefile.am.patch;patch=1" - -DEPENDS = "libgsf1 gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" - - -EXTRA_OECONF = "--without-gnome" - -do_configure_prepend() { - touch xmldocs.make - intltoolize --automake --debug -# # aclocal seems to insist on looking in here. Make sure it exists. -# mkdir -p ${S}/m4 -# # work around automake lossage with AC_CONFIG_AUX_DIR -# ( cd libmutt; libtoolize --force ; cp ../ltmain.sh . ) -} - -inherit autotools diff --git a/packages/gnumeric/gnumeric_1.5.3.bb b/packages/gnumeric/gnumeric_1.5.3.bb deleted file mode 100644 index c3a594a391..0000000000 --- a/packages/gnumeric/gnumeric_1.5.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.5.5.bb b/packages/gnumeric/gnumeric_1.5.5.bb deleted file mode 100644 index c3a594a391..0000000000 --- a/packages/gnumeric/gnumeric_1.5.5.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.5.90.bb b/packages/gnumeric/gnumeric_1.5.90.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.5.90.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.0.bb b/packages/gnumeric/gnumeric_1.6.0.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.1.bb b/packages/gnumeric/gnumeric_1.6.1.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.2.bb b/packages/gnumeric/gnumeric_1.6.2.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/iqnotes/iqnotes.inc b/packages/iqnotes/iqnotes.inc new file mode 100644 index 0000000000..ec49ee2d54 --- /dev/null +++ b/packages/iqnotes/iqnotes.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "IQNotes is notes kept in a hierarchical(tree like) manner. \ +It handles todo, events, sketching. It can acts as a contact, password, \ +credit card manager and even more, because is highly configurable. \ +Data can be crypted by strong AES algorithm." +SECTION = "opie/applications" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libqpe" +MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" +HOMEPAGE = "http://iqnotes.berlios.de" +AUTHOR = "Peter Vrabel <kybu@kybu.org>" + +S = "${WORKDIR}/iqnotes/iqnotes" + +inherit palmtop + +QMAKE_PROFILES = "iqnotes.pro" +export OE_QMAKE_LINK="${CXX}" + +do_install() { + install -d ${D}${palmtopdir}/help/html \ + ${D}${palmtopdir}/bin \ + ${D}${palmtopdir}/apps/Applications \ + ${D}${palmtopdir}/pics/iqnotes/items \ + ${D}${palmtopdir}/iqnotes/icons + install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/ + install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/ + install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/ + install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/ +} diff --git a/packages/iqnotes/iqnotes_2.0.2.bb b/packages/iqnotes/iqnotes_2.0.2.bb index a1c77896c4..fd42188079 100644 --- a/packages/iqnotes/iqnotes_2.0.2.bb +++ b/packages/iqnotes/iqnotes_2.0.2.bb @@ -1,36 +1,7 @@ -DESCRIPTION = "IQNotes is notes kept in a hierarchical(tree like) manner. \ -It handles todo, events, sketching. It can acts as a contact, password, \ -credit card manager and even more, because is highly configurable. \ -Data can be crypted by strong AES algorithm." -SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqpe" -HOMEPAGE = "http://iqnotes.kybu.org" -AUTHOR = "Peter Vrabel <kybu@kybu.org>" -PR = "r3" +include iqnotes.inc + +PR = "r4" SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \ file://md5.diff;patch=1 \ file://qt2310-fontbug.patch;patch=1" - -S = "${WORKDIR}/iqnotes/iqnotes" - -inherit palmtop - -QMAKE_PROFILES = "iqnotes.pro" -export OE_QMAKE_LINK="${CXX}" - - -do_install() { - install -d ${D}${palmtopdir}/help/html \ - ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/iqnotes/items \ - ${D}${palmtopdir}/iqnotes/icons - install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/ - install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/ - install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/ - install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/ -} diff --git a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb index b205c33ceb..6309d8ba1a 100644 --- a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb +++ b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb @@ -1,16 +1,8 @@ -DESCRIPTION = "IQNotes is notes kept in a hierarchical(tree like) manner. \ -It handles todo, events, sketching. It can acts as a contact, password, \ -credit card manager and even more, because is highly configurable. \ -Data can be crypted by strong AES algorithm." -SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqpe" -HOMEPAGE = "http://iqnotes.berlios.de" -AUTHOR = "Peter Vrabel <kybu@users.berlios.de>" +include iqnotes.inc #upstream version UPV = "2.1.0rc1" +PR = "r1" SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \ file://pro.patch;patch=1" @@ -18,19 +10,3 @@ SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \ S = "${WORKDIR}/iqnotes-${UPV}/iqnotes/" EXTRA_QMAKEVARS_POST += "CONFIG-=desktop CONFIG-=debug CONFIG+=pda LIBS-=-lqtopia" -inherit palmtop - -export OE_QMAKE_LINK="${CXX}" - -do_install() { - install -d ${D}${palmtopdir}/help/html \ - ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/iqnotes/items \ - ${D}${palmtopdir}/iqnotes/icons - install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/ - install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/ - install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/ - install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/ -} diff --git a/packages/poppler/poppler_0.3.0.bb b/packages/poppler/poppler_0.3.0.bb deleted file mode 100644 index dc0a7c70ac..0000000000 --- a/packages/poppler/poppler_0.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - diff --git a/packages/poppler/poppler_0.3.3.bb b/packages/poppler/poppler_0.3.3.bb deleted file mode 100644 index 6e03cf9355..0000000000 --- a/packages/poppler/poppler_0.3.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 poppler/.libs/libpoppler.so.0.0.0 ${STAGING_LIBDIR}/libpoppler.so - install -m 755 glib/.libs/libpoppler-glib.so.0.0.0 ${STAGING_LIBDIR}/libpoppler-glib.so - -} - - diff --git a/packages/poppler/poppler_0.4.2.bb b/packages/poppler/poppler_0.4.2.bb deleted file mode 100644 index 6e03cf9355..0000000000 --- a/packages/poppler/poppler_0.4.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 poppler/.libs/libpoppler.so.0.0.0 ${STAGING_LIBDIR}/libpoppler.so - install -m 755 glib/.libs/libpoppler-glib.so.0.0.0 ${STAGING_LIBDIR}/libpoppler-glib.so - -} - - diff --git a/packages/poppler/poppler_0.5.0.bb b/packages/poppler/poppler_0.5.0.bb deleted file mode 100644 index ebe06c4015..0000000000 --- a/packages/poppler/poppler_0.5.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "fontconfig jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - - -do_stage() { - autotools_stage_all -} - - diff --git a/packages/poppler/poppler_0.4.3.bb b/packages/poppler/poppler_0.5.1.bb index ebe06c4015..ebe06c4015 100644 --- a/packages/poppler/poppler_0.4.3.bb +++ b/packages/poppler/poppler_0.5.1.bb diff --git a/packages/qemu/files/trunk_nodocs.patch b/packages/qemu/files/trunk_nodocs.patch new file mode 100644 index 0000000000..36977ca0e7 --- /dev/null +++ b/packages/qemu/files/trunk_nodocs.patch @@ -0,0 +1,40 @@ +diff -Naur trunk_orig/Makefile trunk/Makefile +--- trunk_orig/Makefile 2006-04-01 11:01:54.000000000 +0200 ++++ trunk/Makefile 2006-04-01 12:40:45.000000000 +0200 +@@ -12,7 +12,7 @@ + ifdef CONFIG_STATIC + LDFLAGS+=-static + endif +-DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 ++DOCS= + + all: dyngen$(EXESUF) $(TOOLS) $(DOCS) + for d in $(TARGET_DIRS); do \ +@@ -54,10 +54,10 @@ + pc-bios/proll.elf \ + pc-bios/linux_boot.bin "$(datadir)" + mkdir -p "$(docdir)" +- install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" ++# install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" + ifndef CONFIG_WIN32 + mkdir -p "$(mandir)/man1" +- install qemu.1 qemu-img.1 "$(mandir)/man1" ++# install qemu.1 qemu-img.1 "$(mandir)/man1" + mkdir -p "$(datadir)/keymaps" + install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps" + endif +@@ -122,10 +122,10 @@ + $(datadir)/ppc_rom.bin \ + $(datadir)/video.x \ + $(datadir)/proll.elf \ +- $(datadir)/linux_boot.bin \ +- $(docdir)/qemu-doc.html \ +- $(docdir)/qemu-tech.html \ +- $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 ) ++ $(datadir)/linux_boot.bin ++# $(docdir)/qemu-doc.html \ ++# $(docdir)/qemu-tech.html \ ++# $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 ) + + ifneq ($(wildcard .depend),) + include .depend diff --git a/packages/qemu/qemu-qop-nogfx-native_svn.bb b/packages/qemu/qemu-qop-nogfx-native_svn.bb index cfe57653a2..58c65b606b 100644 --- a/packages/qemu/qemu-qop-nogfx-native_svn.bb +++ b/packages/qemu/qemu-qop-nogfx-native_svn.bb @@ -3,7 +3,8 @@ PV = "0.8.0+svn${SRCDATE}" PROVIDES = "qemu-native" SRC_URI = "svn://nowt.dyndns.org/svn/qemu;module=trunk;proto=https \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://trunk_nodocs.patch;patch=1" S = "${WORKDIR}/trunk" diff --git a/packages/udev/udev-084/udev.rules b/packages/udev/udev-084/udev.rules index 6308cb0918..098b16bc4f 100644 --- a/packages/udev/udev-084/udev.rules +++ b/packages/udev/udev-084/udev.rules @@ -96,3 +96,6 @@ KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" # Firmware Helper ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" + +# on ARM we get /dev/rtc0 but many apps need /dev/rtc +KERNEL=="rtc0" NAME="rtc0" SYMLINK="rtc" diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 85393315c5..e1db0ccd79 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -13,7 +13,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r1" +PR = "r2" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" |