From d264c684381ace00faa32ea710718d85c4253810 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 14 Feb 2005 10:22:01 +0000 Subject: consolidate collie, shepherd, husky into the common machine c7x0. kernel 2.6 handles all three machines, for kernel 2.4 we build three different kernels for every -image build. BKrev: 42107bc9qhsZjYvjPqkddsMIsQuYAA --- packages/base-files/base-files/c7x0/fstab | 0 packages/base-files/base-files/c7x0/usbd | 0 packages/base-files/base-files/corgi/fstab | 0 packages/base-files/base-files/corgi/usbd | 0 packages/base-files/base-files/husky/fstab | 0 packages/base-files/base-files/husky/usbd | 0 packages/base-files/base-files/shepherd/fstab | 0 packages/base-files/base-files/shepherd/usbd | 0 packages/initscripts/initscripts-1.0/c7x0/devices | 0 packages/initscripts/initscripts-1.0/c7x0/keymap | 0 packages/initscripts/initscripts-1.0/corgi/devices | 63 ---------------------- packages/initscripts/initscripts-1.0/corgi/keymap | 0 packages/initscripts/initscripts-1.0/husky/devices | 63 ---------------------- packages/initscripts/initscripts-1.0/husky/keymap | 0 .../initscripts/initscripts-1.0/shepherd/devices | 63 ---------------------- .../initscripts/initscripts-1.0/shepherd/keymap | 0 packages/initscripts/initscripts_1.0.bb | 12 ++--- packages/libqpe/libqpe-opie_1.1.9.bb | 9 ++-- packages/libqpe/libqpe-opie_cvs.bb | 6 ++- ...nzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb | 4 +- packages/mplayer/mplayer_1.0pre3try2.bb | 20 ++----- packages/mplayer/mplayer_1.0pre6.bb | 19 ++----- packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf | 0 packages/opie-taskbar/opie-taskbar/corgi/qpe.conf | 0 packages/opie-taskbar/opie-taskbar/husky/qpe.conf | 0 .../opie-taskbar/opie-taskbar/shepherd/qpe.conf | 0 packages/opie-taskbar/opie-taskbar_1.1.9.bb | 38 ++----------- packages/opie-taskbar/opie-taskbar_cvs.bb | 10 ++-- packages/qfish/qfish2_1.1.0.bb | 6 +-- packages/qmatrix/qmatrix_1.1.0.bb | 42 +++++++++++++++ packages/qte/qte_2.3.10.bb | 10 ++-- .../corgi/sharp_mmcsd_m.o | 0 .../husky/sharp_mmcsd_m.o | 0 .../shepherd/sharp_mmcsd_m.o | 0 ...sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb | 4 +- packages/tslib/tslib/c7x0/tslib.sh | 0 packages/tslib/tslib/corgi/tslib.sh | 16 ------ packages/tslib/tslib/husky/tslib.sh | 16 ------ packages/tslib/tslib/shepherd/tslib.sh | 16 ------ packages/tslib/tslib_cvs.bb | 2 +- 40 files changed, 81 insertions(+), 338 deletions(-) create mode 100644 packages/base-files/base-files/c7x0/fstab create mode 100644 packages/base-files/base-files/c7x0/usbd delete mode 100644 packages/base-files/base-files/corgi/fstab delete mode 100644 packages/base-files/base-files/corgi/usbd delete mode 100644 packages/base-files/base-files/husky/fstab delete mode 100644 packages/base-files/base-files/husky/usbd delete mode 100644 packages/base-files/base-files/shepherd/fstab delete mode 100644 packages/base-files/base-files/shepherd/usbd create mode 100644 packages/initscripts/initscripts-1.0/c7x0/devices create mode 100644 packages/initscripts/initscripts-1.0/c7x0/keymap delete mode 100644 packages/initscripts/initscripts-1.0/corgi/devices delete mode 100644 packages/initscripts/initscripts-1.0/corgi/keymap delete mode 100644 packages/initscripts/initscripts-1.0/husky/devices delete mode 100644 packages/initscripts/initscripts-1.0/husky/keymap delete mode 100644 packages/initscripts/initscripts-1.0/shepherd/devices delete mode 100644 packages/initscripts/initscripts-1.0/shepherd/keymap create mode 100644 packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/corgi/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/husky/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/shepherd/qpe.conf delete mode 100644 packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/corgi/sharp_mmcsd_m.o delete mode 100644 packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/husky/sharp_mmcsd_m.o delete mode 100644 packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/shepherd/sharp_mmcsd_m.o create mode 100644 packages/tslib/tslib/c7x0/tslib.sh delete mode 100644 packages/tslib/tslib/corgi/tslib.sh delete mode 100644 packages/tslib/tslib/husky/tslib.sh delete mode 100644 packages/tslib/tslib/shepherd/tslib.sh (limited to 'packages') diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/base-files/base-files/c7x0/usbd b/packages/base-files/base-files/c7x0/usbd new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/base-files/base-files/corgi/fstab b/packages/base-files/base-files/corgi/fstab deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/base-files/base-files/corgi/usbd b/packages/base-files/base-files/corgi/usbd deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/base-files/base-files/husky/fstab b/packages/base-files/base-files/husky/fstab deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/base-files/base-files/husky/usbd b/packages/base-files/base-files/husky/usbd deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/base-files/base-files/shepherd/fstab b/packages/base-files/base-files/shepherd/fstab deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/base-files/base-files/shepherd/usbd b/packages/base-files/base-files/shepherd/usbd deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/initscripts/initscripts-1.0/c7x0/devices b/packages/initscripts/initscripts-1.0/c7x0/devices new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap b/packages/initscripts/initscripts-1.0/c7x0/keymap new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/initscripts/initscripts-1.0/corgi/devices b/packages/initscripts/initscripts-1.0/corgi/devices deleted file mode 100644 index b3a3323b8a..0000000000 --- a/packages/initscripts/initscripts-1.0/corgi/devices +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# Devfs handling script. Since we arent running devfsd due to various reasons -# which I will not lay out here, we need to create some links for compatibility. - -. /etc/default/rcS - -if test -e /dev/.devfsd -then - if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi - ln -s /dev/touchscreen/0 /dev/ts - ln -s /dev/touchscreen/0raw /dev/tsraw - ln -s /dev/vc/0 /dev/tty0 - ln -s /dev/vc/1 /dev/tty1 - ln -s /dev/vc/2 /dev/tty2 - ln -s /dev/vc/3 /dev/tty3 - ln -s /dev/vc/4 /dev/tty4 - ln -s /dev/vc/5 /dev/tty5 - ln -s /dev/fb/0 /dev/fb0 -# ln -s /dev/tts/0 /dev/ttySA0 -# ln -s /dev/tts/1 /dev/ttySA1 -# ln -s /dev/tts/2 /dev/ttySA2 - - ln -s /dev/sound/dsp /dev/dsp - ln -s /dev/sound/mixer /dev/mixer - - ln -s /dev/v4l/video0 /dev/video0 - ln -s /dev/v4l/video0 /dev/video - ln -s /dev/misc/rtc /dev/rtc - - ## need this so that ppp will autoload the ppp modules - mknod /dev/ppp c 108 0 - if test "$VERBOSE" != "no"; then echo "done"; fi -else - if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi - mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi - if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi - cd / - mkdir -p dev/msys - mkdir -p dev/pts - mkdir -p dev/input - mkdir -p dev/vc - for i in 0 1 2 3 4 5 6 7 8 9; do - ln -s /dev/tty$i /dev/vc/$i - done - ln -sf /dev/sharp_ts /dev/ts - ln -sf /dev/sharp_fl /dev/fl - ln -sf /proc/self/fd /dev/fd - ln -sf /proc/kcore /dev/core - /sbin/makedevs -r / -D /etc/device_table - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi -fi - -exit 0 diff --git a/packages/initscripts/initscripts-1.0/corgi/keymap b/packages/initscripts/initscripts-1.0/corgi/keymap deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/initscripts/initscripts-1.0/husky/devices b/packages/initscripts/initscripts-1.0/husky/devices deleted file mode 100644 index b3a3323b8a..0000000000 --- a/packages/initscripts/initscripts-1.0/husky/devices +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# Devfs handling script. Since we arent running devfsd due to various reasons -# which I will not lay out here, we need to create some links for compatibility. - -. /etc/default/rcS - -if test -e /dev/.devfsd -then - if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi - ln -s /dev/touchscreen/0 /dev/ts - ln -s /dev/touchscreen/0raw /dev/tsraw - ln -s /dev/vc/0 /dev/tty0 - ln -s /dev/vc/1 /dev/tty1 - ln -s /dev/vc/2 /dev/tty2 - ln -s /dev/vc/3 /dev/tty3 - ln -s /dev/vc/4 /dev/tty4 - ln -s /dev/vc/5 /dev/tty5 - ln -s /dev/fb/0 /dev/fb0 -# ln -s /dev/tts/0 /dev/ttySA0 -# ln -s /dev/tts/1 /dev/ttySA1 -# ln -s /dev/tts/2 /dev/ttySA2 - - ln -s /dev/sound/dsp /dev/dsp - ln -s /dev/sound/mixer /dev/mixer - - ln -s /dev/v4l/video0 /dev/video0 - ln -s /dev/v4l/video0 /dev/video - ln -s /dev/misc/rtc /dev/rtc - - ## need this so that ppp will autoload the ppp modules - mknod /dev/ppp c 108 0 - if test "$VERBOSE" != "no"; then echo "done"; fi -else - if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi - mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi - if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi - cd / - mkdir -p dev/msys - mkdir -p dev/pts - mkdir -p dev/input - mkdir -p dev/vc - for i in 0 1 2 3 4 5 6 7 8 9; do - ln -s /dev/tty$i /dev/vc/$i - done - ln -sf /dev/sharp_ts /dev/ts - ln -sf /dev/sharp_fl /dev/fl - ln -sf /proc/self/fd /dev/fd - ln -sf /proc/kcore /dev/core - /sbin/makedevs -r / -D /etc/device_table - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi -fi - -exit 0 diff --git a/packages/initscripts/initscripts-1.0/husky/keymap b/packages/initscripts/initscripts-1.0/husky/keymap deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/initscripts/initscripts-1.0/shepherd/devices b/packages/initscripts/initscripts-1.0/shepherd/devices deleted file mode 100644 index b3a3323b8a..0000000000 --- a/packages/initscripts/initscripts-1.0/shepherd/devices +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# Devfs handling script. Since we arent running devfsd due to various reasons -# which I will not lay out here, we need to create some links for compatibility. - -. /etc/default/rcS - -if test -e /dev/.devfsd -then - if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi - ln -s /dev/touchscreen/0 /dev/ts - ln -s /dev/touchscreen/0raw /dev/tsraw - ln -s /dev/vc/0 /dev/tty0 - ln -s /dev/vc/1 /dev/tty1 - ln -s /dev/vc/2 /dev/tty2 - ln -s /dev/vc/3 /dev/tty3 - ln -s /dev/vc/4 /dev/tty4 - ln -s /dev/vc/5 /dev/tty5 - ln -s /dev/fb/0 /dev/fb0 -# ln -s /dev/tts/0 /dev/ttySA0 -# ln -s /dev/tts/1 /dev/ttySA1 -# ln -s /dev/tts/2 /dev/ttySA2 - - ln -s /dev/sound/dsp /dev/dsp - ln -s /dev/sound/mixer /dev/mixer - - ln -s /dev/v4l/video0 /dev/video0 - ln -s /dev/v4l/video0 /dev/video - ln -s /dev/misc/rtc /dev/rtc - - ## need this so that ppp will autoload the ppp modules - mknod /dev/ppp c 108 0 - if test "$VERBOSE" != "no"; then echo "done"; fi -else - if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi - mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi - if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi - cd / - mkdir -p dev/msys - mkdir -p dev/pts - mkdir -p dev/input - mkdir -p dev/vc - for i in 0 1 2 3 4 5 6 7 8 9; do - ln -s /dev/tty$i /dev/vc/$i - done - ln -sf /dev/sharp_ts /dev/ts - ln -sf /dev/sharp_fl /dev/fl - ln -sf /proc/self/fd /dev/fd - ln -sf /proc/kcore /dev/core - /sbin/makedevs -r / -D /etc/device_table - if test $? -ne 0; then - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi - fi -fi - -exit 0 diff --git a/packages/initscripts/initscripts-1.0/shepherd/keymap b/packages/initscripts/initscripts-1.0/shepherd/keymap deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 5fd5f52ebb..d5728c1e86 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r32" +PR = "r33" SRC_URI = "file://halt \ file://ramdisk \ @@ -34,9 +34,7 @@ SRC_URI = "file://halt \ SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" -SRC_URI_append_corgi = " file://keymap" -SRC_URI_append_shepherd = " file://keymap" -SRC_URI_append_husky = " file://keymap" +SRC_URI_append_c7x0 = " file://keymap" def read_kernel_version(d): import bb @@ -93,10 +91,10 @@ do_install () { ln -sf ../init.d/checkversion ${D}/etc/rcS.d/S05version fi - if [ "${MACHINE}" == "corgi" -o "${MACHINE}" == "shepherd" -o "${MACHINE}" == "husky" ]; then + if [ "${MACHINE}" == "c7x0" ]; then install -m 0755 ${WORKDIR}/corgikeymap-2.6.map ${D}/etc - install -m 0755 ${WORKDIR}/keymap ${D}/etc/init.d - ln -sf ../init.d/keymap ${D}/etc/rcS.d/S04keymap + install -m 0755 ${WORKDIR}/keymap ${D}/etc/init.d + ln -sf ../init.d/keymap ${D}/etc/rcS.d/S04keymap fi diff --git a/packages/libqpe/libqpe-opie_1.1.9.bb b/packages/libqpe/libqpe-opie_1.1.9.bb index 22a83243dc..ed03318a49 100644 --- a/packages/libqpe/libqpe-opie_1.1.9.bb +++ b/packages/libqpe/libqpe-opie_1.1.9.bb @@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "uicmoc-native qte" PROVIDES = "virtual/libqpe" -PR = "r1" +PR = "r2" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ @@ -20,11 +20,8 @@ EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" EXTRA_QMAKEVARS_POST = "DESTDIR=" CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" - -CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED " -CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED " -CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED " -XXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " do_compile() { mkdir -p ${STAGING_INCDIR}/qpe \ diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index a268b75a1a..9df42b4335 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "uicmoc-native qte" PROVIDES = "virtual/libqpe" PV = "1.1.9+cvs-${CVSDATE}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://nomax.patch;patch=1;pnum=1" @@ -18,7 +18,9 @@ QMAKE_PROFILES = "library.pro" EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" EXTRA_QMAKEVARS_POST = "DESTDIR=" -CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NO_WINDOWED -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" +CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" +CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " do_compile_prepend_ramses () { ln -s custom-ramses.h custom.h diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb index 1cc4069c35..e9890fa43a 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb @@ -7,7 +7,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r32" +PR = "r33" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" ALLOW_EMPTY_kernel = "1" @@ -96,7 +96,7 @@ do_configure_prepend() { do_deploy() { install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${PACKAGE_ARCH}-${DATETIME}.bin } do_deploy[dirs] = "${S}" diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb index 2749c01cbb..e227eb3664 100644 --- a/packages/mplayer/mplayer_1.0pre3try2.bb +++ b/packages/mplayer/mplayer_1.0pre3try2.bb @@ -3,28 +3,18 @@ SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "virtual/libsdl libmad tremor-20021126 libogg libvorbis zlib libpng jpeg" -PR = "r4" +PR = "r5" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=0 \ file://sdl.patch;patch=0 \ file://zlib.patch;patch=0 " -DEPENDS_corgi += "sharp-aticore" -DEPENDS_shepherd += "sharp-aticore" -DEPENDS_husky += "sharp-aticore" +DEPENDS_c7x0 += "sharp-aticore" +PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}" +SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ + file://Makefile-vidix.patch;patch=0 " -PACKAGE_ARCH_corgi = "${MACHINE_ARCH}" -PACKAGE_ARCH_shepherd = "${MACHINE_ARCH}" -PACKAGE_ARCH_husky = "${MACHINE_ARCH}" - -SRC_URI_append_corgi = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ - file://Makefile-vidix.patch;patch=0 " -SRC_URI_append_shepherd = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ - file://Makefile-vidix.patch;patch=0 " -SRC_URI_append_husky = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ - file://Makefile-vidix.patch;patch=0 " - S = "${WORKDIR}/MPlayer-${PV}" PACKAGES =+ "postproc postproc-dev" diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb index 4d96a4e4ff..95c44961a4 100644 --- a/packages/mplayer/mplayer_1.0pre6.bb +++ b/packages/mplayer/mplayer_1.0pre6.bb @@ -8,24 +8,15 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=1 \ file://sdl.patch;patch=0 \ file://zlib.patch;patch=0 " +PR = "r1" DEFAULT_PREFERENCE = "-1" -DEPENDS_corgi += "sharp-aticore" -DEPENDS_shepherd += "sharp-aticore" -DEPENDS_husky += "sharp-aticore" +DEPENDS_c7x0 += "sharp-aticore" +PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}" +SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ + file://Makefile-vidix.patch;patch=0 " -PACKAGE_ARCH_corgi = "${MACHINE_ARCH}" -PACKAGE_ARCH_shepherd = "${MACHINE_ARCH}" -PACKAGE_ARCH_husky = "${MACHINE_ARCH}" - -SRC_URI_append_corgi = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ - file://Makefile-vidix.patch;patch=0 " -SRC_URI_append_shepherd = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ - file://Makefile-vidix.patch;patch=0 " -SRC_URI_append_husky = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ - file://Makefile-vidix.patch;patch=0 " - S = "${WORKDIR}/MPlayer-${PV}" PACKAGES =+ "postproc postproc-dev" diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-taskbar/opie-taskbar/corgi/qpe.conf b/packages/opie-taskbar/opie-taskbar/corgi/qpe.conf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/husky/qpe.conf b/packages/opie-taskbar/opie-taskbar/husky/qpe.conf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/shepherd/qpe.conf b/packages/opie-taskbar/opie-taskbar/shepherd/qpe.conf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar_1.1.9.bb b/packages/opie-taskbar/opie-taskbar_1.1.9.bb index ad962e7fd5..058eaa431c 100644 --- a/packages/opie-taskbar/opie-taskbar_1.1.9.bb +++ b/packages/opie-taskbar/opie-taskbar_1.1.9.bb @@ -4,10 +4,9 @@ PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie " DEPENDS = "opie-libqrsync" -PR = "r1" +PR = "r2" APPNAME = "qpe" - SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \ @@ -24,24 +23,18 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ S = "${WORKDIR}/launcher" -CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED " -CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED " -CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " # Caps/Numlock icons for devices with keyboard EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" # Wallpaper and welcome splash PIXMAP_SIZE = "" -PIXMAP_SIZE_shepherd = "-640x480" -PIXMAP_SIZE_corgi = "-640x480" -PIXMAP_SIZE_husky = "-640x480" +PIXMAP_SIZE_c7x0 = "-640x480" # PIXMAP_SIZE_tosa = "-640x480" PIXMAP_SIZE_simpad = "-800x600" @@ -100,30 +93,7 @@ do_install() { install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/ -} -# These two should be installed only on devices with keyboard -do_install_append_collie () { - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ -} -do_install_append_poodle () { - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ -} -do_install_append_corgi () { - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ -} -do_install_append_shepherd () { - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ -} -do_install_append_husky () { - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ -} -do_install_append_tosa () { install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ } diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index bb37208470..9c75d57947 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" MAINTAINER = "Team Opie " DEPENDS = "opie-libqrsync" PV = "1.1.9+cvs-${CVSDATE}" -PR = "r3" +PR = "r4" APPNAME = "qpe" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ @@ -27,16 +27,12 @@ S = "${WORKDIR}/launcher" # Caps/Numlock icons for devices with keyboard EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" # Wallpaper and welcome splash PIXMAP_SIZE = "" -PIXMAP_SIZE_shepherd = "-640x480" -PIXMAP_SIZE_corgi = "-640x480" -PIXMAP_SIZE_husky = "-640x480" +PIXMAP_SIZE_c7x0 = "-640x480" # PIXMAP_SIZE_tosa = "-640x480" PIXMAP_SIZE_simpad = "-800x600" diff --git a/packages/qfish/qfish2_1.1.0.bb b/packages/qfish/qfish2_1.1.0.bb index 21fd9457a2..2822d622f3 100644 --- a/packages/qfish/qfish2_1.1.0.bb +++ b/packages/qfish/qfish2_1.1.0.bb @@ -3,7 +3,7 @@ MAINTAINER = "Michael 'Mickey' Lauer " SECTION = "opie/games" LICENSE = "GPL" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI = "http://taiga0818.hp.infoseek.co.jp/rpms/qfish2-${PV}.tar.gz" S = "${WORKDIR}/qfish" @@ -11,9 +11,7 @@ S = "${WORKDIR}/qfish" inherit palmtop MACHTYPE = "sl300" -MACHTYPE_corgi = "sl700" -MACHTYPE_shepherd = "sl700" -MACHTYPE_husky = "sl700" +MACHTYPE_c7x0 = "sl700" MACHTYPE_tosa = "sl700" do_configure_append() { diff --git a/packages/qmatrix/qmatrix_1.1.0.bb b/packages/qmatrix/qmatrix_1.1.0.bb index e69de29bb2..84ed03d43c 100644 --- a/packages/qmatrix/qmatrix_1.1.0.bb +++ b/packages/qmatrix/qmatrix_1.1.0.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "A matrix Game, Qt/Embedded based Palmtop Environments Edition" +MAINTAINER = "Michael 'Mickey' Lauer " +SECTION = "opie/games" +LICENSE = "GPL" +PRIORITY = "optional" +PR = "r2" + +SRC_URI = "http://www.geocities.co.jp/SiliconValley-Oakland/8074/src/qmatrix-${PV}.tar.gz" +S = "${WORKDIR}/qmatrix" + +inherit palmtop + +MACHTYPE = "sl300" +MACHTYPE_c7x0 = "sl700" +MACHTYPE_tosa = "sl700" + +do_configure_append() { + ln -v -f -s config/config-${MACHTYPE}.h config.h + ln -v -f -s config/config.mk-${MACHTYPE} config.mk + if [ "${MACHTYPE}" = "sl300" ] + then + ln -vfs bigFishSize.h areaSize.h + else + ln -vfs smallFishSize.h areaSize.h + fi + ln -v -f -s HiScoreRegConfig-${MACHTYPE}.h HiScoreRegConfig.h +} + +do_compile_prepend() { + cd images && oe_runmake && cd ${S} +} + +do_install() { + install -d ${D}${palmtopdir}/apps/Games + install -m 0644 desktop/qmatrix-${MACHTYPE}.desktop ${D}${palmtopdir}/apps/Games/qmatrix.desktop + install -d ${D}${palmtopdir}/bin + install -m 0755 qmatrix ${D}${palmtopdir}/bin/qmatrix + install -d ${D}${palmtopdir}/pics + install -m 0644 desktop/qmatrix.png ${D}${palmtopdir}/pics/ + install -d ${D}${palmtopdir}/help/html/ + install -m 0644 desktop/qmatrix.html ${D}${palmtopdir}/help/html/qmatrix.html +} diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index a2dc0a26b6..a751dabcfb 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL QPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://qpe.patch;patch=1 \ @@ -26,9 +26,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://switches.h " SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_corgi = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 " -SRC_URI_append_shepherd = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 " -SRC_URI_append_husky = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 " +SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 " SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " SRC_URI_append_beagle = "file://beagle.patch;patch=1 " SRC_URI_append_jornada720 = "file://kernel-keymap.patch;patch=1 " @@ -69,9 +67,7 @@ EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada720 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" -EXTRA_DEFINES_corgi = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_shepherd = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_husky = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" +EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" EXTRA_DEFINES_beagle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_BEAGLE" export SYSCONF_CC = "${CC}" diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/corgi/sharp_mmcsd_m.o b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/corgi/sharp_mmcsd_m.o deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/husky/sharp_mmcsd_m.o b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/husky/sharp_mmcsd_m.o deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/shepherd/sharp_mmcsd_m.o b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/shepherd/sharp_mmcsd_m.o deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb index 71edc0bcda..652703361e 100644 --- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb +++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb @@ -4,9 +4,9 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "CLOSED" RDEPENDS = "kernel (${KERNEL_VERSION})" -PR = "r11" +PR = "r12" -SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \ +SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r1.tar.bz2 \ file://sd \ file://sdmgr \ file://sdcontrol" diff --git a/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/tslib/tslib/corgi/tslib.sh b/packages/tslib/tslib/corgi/tslib.sh deleted file mode 100644 index dc7484cada..0000000000 --- a/packages/tslib/tslib/corgi/tslib.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_TSEVENTTYPE=CORGI - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -*) - TSLIB_TSDEVICE=/dev/input/event1 - TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi - ;; -esac - -export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/husky/tslib.sh b/packages/tslib/tslib/husky/tslib.sh deleted file mode 100644 index dc7484cada..0000000000 --- a/packages/tslib/tslib/husky/tslib.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_TSEVENTTYPE=CORGI - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -*) - TSLIB_TSDEVICE=/dev/input/event1 - TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi - ;; -esac - -export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/shepherd/tslib.sh b/packages/tslib/tslib/shepherd/tslib.sh deleted file mode 100644 index dc7484cada..0000000000 --- a/packages/tslib/tslib/shepherd/tslib.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case `uname -r` in -2.4*) - TSLIB_TSDEVICE=/dev/ts - TSLIB_TSEVENTTYPE=CORGI - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 - ;; -*) - TSLIB_TSDEVICE=/dev/input/event1 - TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi - ;; -esac - -export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 25b7b0ba5d..9c0699df05 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -49,7 +49,7 @@ do_install_append() { done rm -f ${D}${sysconfdir}/ts.conf ;; - corgi | shepherd | husky) + c7x0) install -d ${D}${datadir}/tslib for f in ts.conf-corgi ts.conf-corgi-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ -- cgit 1.2.3-korg