diff options
62 files changed, 126 insertions, 130 deletions
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 1e578c48ba..b89d5728f7 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -1,6 +1,7 @@ BBFILES := "\ ${PKGDIR}/packages/alsa/*.bb \ ${PKGDIR}/packages/apr/*.bb \ +${PKGDIR}/packages/asterisk/*.bb \ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ ${PKGDIR}/packages/aumix/*.bb \ diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index b1dcd7fe3b..9076355522 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 88df07cddb..068d8c4677 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers \ diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index af66c7294e..b2ca8370e7 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -10,7 +10,7 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ +pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index e73028d7ee..95f3c528e8 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -7,7 +7,7 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules diff --git a/packages/asterisk/asterisk_1.0.9.bb b/packages/asterisk/asterisk_1.0.9.bb index fa0daa7bf7..3ee67f4bac 100644 --- a/packages/asterisk/asterisk_1.0.9.bb +++ b/packages/asterisk/asterisk_1.0.9.bb @@ -2,8 +2,9 @@ DESCRIPTION="The Astersisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl" +PR = "r1" -SRC_URI="http://ftp.digium.com/pub/asterisk/asterisk-${PV}.tar.gz \ +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://gsm.patch;patch=1 \ file://makefile.patch;patch=1" diff --git a/packages/gpe-wlancfg/gpe-wlancfg-makefile.patch b/packages/gpe-wlancfg/gpe-wlancfg-makefile.patch deleted file mode 100644 index 8a390f000b..0000000000 --- a/packages/gpe-wlancfg/gpe-wlancfg-makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== -RCS file: /cvs/gpe/base/gpe-wlancfg2/Makefile,v -retrieving revision 1.20 -diff -r1.20 Makefile -62c62 -< $(CC) -o $@ $^ $(LDFLAGS) $(GPELIBS) -lfl -lXrender -lXinerama ---- -> $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) -72c72 -< install-program: all ---- -> install-program: all $(PACKAGE).desktop diff --git a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb b/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb deleted file mode 100644 index 0e752f48b8..0000000000 --- a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb +++ /dev/null @@ -1,14 +0,0 @@ -PR = "r1" -LICENSE = "GPL" -inherit gpe pkgconfig - -DEPENDS = "libgpewidget flex" -SECTION = "gpe" -MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -RDEPENDS = "gpe-su" - -DESCRIPTION = "GPE wireless LAN configuration tool" -export CVSBUILD = "no" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ - file://${FILESDIR}/gpe-wlancfg-makefile.patch;patch=1;pnum=0" diff --git a/packages/groff/groff_1.19.1.bb b/packages/groff/groff_1.19.1.bb index 0a03dd2b75..2560bde92b 100644 --- a/packages/groff/groff_1.19.1.bb +++ b/packages/groff/groff_1.19.1.bb @@ -1,14 +1,16 @@ -LICENSE = "GPL" -SECTION = "base" DESCRIPTION = "GNU roff" +SECTION = "base" +LICENSE = "GPL" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" +PR = "r2" + SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ file://groff.patch;patch=1" -PR = "r1" +PARALLEL_MAKE = "" # prefix and exec-prefix are broken and the .in file is broken too # and can't be autoreconf'ed, so specify every dir -EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/man --infodir=${D}/usr/share/info" +EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info" inherit autotools diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb index 4356de6a1d..24cc5eadea 100644 --- a/packages/groff/groff_1.19.2.bb +++ b/packages/groff/groff_1.19.2.bb @@ -1,16 +1,18 @@ -LICENSE = "GPL" -SECTION = "base" DESCRIPTION = "GNU roff" +SECTION = "base" +LICENSE = "GPL" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" +PR = "r2" + SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ file://Makefile.in.patch;patch=1 \ file://Makefile.sub.patch;patch=1 \ file://groff.patch;patch=1" -PR = "r1" +PARALLEL_MAKE = "" # prefix and exec-prefix are broken and the .in file is broken too # and can't be autoreconf'ed, so specify every dir -EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/man --infodir=${D}/usr/share/info" +EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info" inherit autotools do_configure () { diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc index 72f2dc2da3..6f482e64e4 100644 --- a/packages/hostap/hostap-modules.inc +++ b/packages/hostap/hostap-modules.inc @@ -3,13 +3,14 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PROVIDES = "hostap-conf" +PROVIDES = "virtual/kernel-hostap" RPROVIDES = "virtual/kernel-hostap" -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf" +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz" + SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" + SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " S = "${WORKDIR}/hostap-driver-${PV}" @@ -24,21 +25,17 @@ NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_cryp do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia for i in ${NET_MODULES} do install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ done install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf } PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" -RPROVIDES_hostap-modules-cs = "hostap-conf" +RDEPENDS_hostap-modules-cs = "hostap-modules (${PV}) hostap-conf" +RDEPENDS_hostap-modules-pci = "hostap-modules (${PV})" diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb index 2a09550772..d6bdd5ba37 100644 --- a/packages/hostap/hostap-modules_0.3.10.bb +++ b/packages/hostap/hostap-modules_0.3.10.bb @@ -1,5 +1,5 @@ include hostap-modules.inc -PR = "r7" +PR = "r8" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb index 5980783840..c1ab69a6c9 100644 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ b/packages/hostap/hostap-modules_0.3.7.bb @@ -1,5 +1,5 @@ include hostap-modules.inc -PR = "r7" +PR = "r8" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb index 508c653230..cc09fd5952 100644 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -1,5 +1,5 @@ include hostap-modules.inc -PR = "r9" +PR = "r10" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb index b3d0a8e949..399d60cc20 100644 --- a/packages/hostap/hostap-modules_0.4.4.bb +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -1,4 +1,4 @@ include hostap-modules.inc -PR = "r5" +PR = "r6" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb index e9efcb5617..21effc081b 100644 --- a/packages/hostap/hostap-modules_0.4.7.bb +++ b/packages/hostap/hostap-modules_0.4.7.bb @@ -1,4 +1,4 @@ include hostap-modules.inc -PR = "r3" +PR = "r4" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index d9b93005f5..ed4e205519 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 = "r69" +PR = "r70" SRC_URI = "file://halt \ file://ramdisk \ @@ -31,18 +31,10 @@ SRC_URI = "file://halt \ file://sysfs.sh \ file://device_table.txt \ file://populate-volatile.sh \ - file://volatiles \ - file://keymap" + file://volatiles " SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" -SRC_URI_append_c7x0 = " file://keymap-*.map" -SRC_URI_append_tosa = " file://keymap-*.map" -SRC_URI_append_akita = " file://keymap-*.map" -SRC_URI_append_spitz = " file://keymap-*.map" -SRC_URI_append_borzoi = " file://keymap-*.map" -SRC_URI_append_collie = " file://keymap-*.map" -SRC_URI_append_poodle = " file://keymap-*.map" def read_kernel_version(d): import bb @@ -104,16 +96,6 @@ do_install () { ln -sf ../init.d/checkversion ${D}${sysconfdir}/rcS.d/S01version fi - case ${MACHINE} in - c7x0 | tosa | spitz | akita | borzoi | collie | poodle ) - install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d - ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap - install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} - ;; - *) - ;; - esac - install -m 0755 ${WORKDIR}/banner ${D}${sysconfdir}/init.d/banner install -m 0755 ${WORKDIR}/devices ${D}${sysconfdir}/init.d/devices install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs diff --git a/packages/gpe-wlancfg/.mtn2git_empty b/packages/keymaps/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-wlancfg/.mtn2git_empty +++ b/packages/keymaps/.mtn2git_empty diff --git a/packages/zbedic/zbedic-0.9.6/.mtn2git_empty b/packages/keymaps/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zbedic/zbedic-0.9.6/.mtn2git_empty +++ b/packages/keymaps/files/.mtn2git_empty diff --git a/packages/keymaps/files/akita/.mtn2git_empty b/packages/keymaps/files/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/akita/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/packages/keymaps/files/akita/keymap-2.4.map index e6339979e8..e6339979e8 100644 --- a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map +++ b/packages/keymaps/files/akita/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map b/packages/keymaps/files/akita/keymap-2.6.map index 6fc3a9a9cf..6fc3a9a9cf 100644 --- a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map +++ b/packages/keymaps/files/akita/keymap-2.6.map diff --git a/packages/keymaps/files/borzoi/.mtn2git_empty b/packages/keymaps/files/borzoi/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/borzoi/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/keymaps/files/borzoi/keymap-2.4.map index e6339979e8..e6339979e8 100644 --- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map +++ b/packages/keymaps/files/borzoi/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map b/packages/keymaps/files/borzoi/keymap-2.6.map index 6fc3a9a9cf..6fc3a9a9cf 100644 --- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map +++ b/packages/keymaps/files/borzoi/keymap-2.6.map diff --git a/packages/keymaps/files/c7x0/.mtn2git_empty b/packages/keymaps/files/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/c7x0/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/keymaps/files/c7x0/keymap-2.6.map index 6fc3a9a9cf..6fc3a9a9cf 100755..100644 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/keymaps/files/c7x0/keymap-2.6.map diff --git a/packages/keymaps/files/collie/.mtn2git_empty b/packages/keymaps/files/collie/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/collie/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map b/packages/keymaps/files/collie/keymap-2.4.map index 4cd8325bb0..4cd8325bb0 100644 --- a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map +++ b/packages/keymaps/files/collie/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map b/packages/keymaps/files/collie/keymap-2.6.map index 285b597c99..285b597c99 100644 --- a/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map +++ b/packages/keymaps/files/collie/keymap-2.6.map diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/keymaps/files/keymap index 6ebc634266..6ebc634266 100755..100644 --- a/packages/initscripts/initscripts-1.0/keymap +++ b/packages/keymaps/files/keymap diff --git a/packages/keymaps/files/poodle/.mtn2git_empty b/packages/keymaps/files/poodle/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/poodle/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map b/packages/keymaps/files/poodle/keymap-2.6.map index 285b597c99..285b597c99 100644 --- a/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map +++ b/packages/keymaps/files/poodle/keymap-2.6.map diff --git a/packages/keymaps/files/spitz/.mtn2git_empty b/packages/keymaps/files/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/spitz/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/packages/keymaps/files/spitz/keymap-2.4.map index e6339979e8..e6339979e8 100644 --- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map +++ b/packages/keymaps/files/spitz/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map b/packages/keymaps/files/spitz/keymap-2.6.map index 6fc3a9a9cf..6fc3a9a9cf 100644 --- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map +++ b/packages/keymaps/files/spitz/keymap-2.6.map diff --git a/packages/keymaps/files/tosa/.mtn2git_empty b/packages/keymaps/files/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/tosa/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/keymaps/files/tosa/keymap-2.4.map index 31ca75b660..31ca75b660 100644 --- a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map +++ b/packages/keymaps/files/tosa/keymap-2.4.map diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.6.map b/packages/keymaps/files/tosa/keymap-2.6.map index ac43471326..ac43471326 100644 --- a/packages/initscripts/initscripts-1.0/tosa/keymap-2.6.map +++ b/packages/keymaps/files/tosa/keymap-2.6.map diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb new file mode 100644 index 0000000000..4df5df8113 --- /dev/null +++ b/packages/keymaps/keymaps_1.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Keyboard map" +SECTION = "base" +MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" +RDEPENDS = "initscripts console-tools" +LICENSE = "GPL" +PACKAGE_ARCH = "${MACHINE}" +PR = "r2" + +inherit update-rc.d + +SRC_URI = "file://keymap" + +SRC_URI_append_c7x0 = " file://keymap-*.map" +SRC_URI_append_tosa = " file://keymap-*.map" +SRC_URI_append_akita = " file://keymap-*.map" +SRC_URI_append_spitz = " file://keymap-*.map" +SRC_URI_append_collie = " file://keymap-*.map" +SRC_URI_append_poodle = " file://keymap-*.map" + +INITSCRIPT_NAME = "keymap" +INITSCRIPT_PARAMS = "start 00 S ." + +do_install () { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/ + + case ${MACHINE} in + c7x0 | tosa | spitz | akita | borzoi | collie | poodle ) + install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} + ;; + *) + ;; + esac +} diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 index 996fba9724..669efab8b5 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 @@ -144,7 +144,7 @@ CONFIG_CPU_TLB_V4WBI=y # CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y CONFIG_SHARP_SCOOP=y diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 index 794ff52a88..eb56a0a7bc 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 @@ -143,7 +143,7 @@ CONFIG_CPU_TLB_V4WBI=y # CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y CONFIG_SHARP_SCOOP=y diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 74edea8df8..531833278c 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -3,7 +3,7 @@ SECTION = "kernel" MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" PROVIDES = "virtual/kernel-hostap" -RPROVIDES = "virtual/kernel-hostap" +RPROVIDES_kernel-module-hostap-cs = "virtual/kernel-hostap" DOSRC = "http://www.do13.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 0cf048ed72..f6095ba33a 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,8 +1,6 @@ include linux-openzaurus.inc -PR = "r4" - -DEFAULT_PREFERENCE = "-1" +PR = "r5" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb index 9c6e75b9a5..f99b818cb3 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb @@ -1,5 +1,5 @@ include matchbox-panel.inc - +DEFAULT_PREFERENCE = "-1" PR="r0" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://mb-applet-battery-repaint-093.patch;patch=1" diff --git a/packages/meta/bootstrap-image.bb b/packages/meta/bootstrap-image.bb index c7d3b5d52d..1791dd8f56 100644 --- a/packages/meta/bootstrap-image.bb +++ b/packages/meta/bootstrap-image.bb @@ -6,11 +6,6 @@ DEPENDS = "task-bootstrap" inherit image_ipk -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe \ - opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie \ - e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e" - FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index a53c4d4dc0..92bed0dd5c 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -1,10 +1,6 @@ -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" -FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" -PR = "r19" +PR = "r20" export IMAGE_BASENAME = "gpe-image" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index b68995e2da..c786f67e0b 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -1,12 +1,10 @@ export IMAGE_BASENAME = "opie-image" export IMAGE_LINGUAS = "" -FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" -FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" LICENSE = "MIT" -PR = "r20" +PR = "r21" DEPENDS = "task-bootstrap task-opie" RDEPENDS = "${INSTALL_PACKAGES}" diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb index 0b8211cb8a..50634e0353 100644 --- a/packages/meta/pivotboot-image.bb +++ b/packages/meta/pivotboot-image.bb @@ -3,14 +3,10 @@ export IMAGE_LINGUAS = "" export IPKG_INSTALL = "task-pivotboot" DEPENDS = "task-pivotboot" +PR = "r1" inherit image_ipk -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe \ - opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie \ - e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e" - FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb index 39109245f1..be7f28fb91 100644 --- a/packages/meta/sectest-gpe-image.bb +++ b/packages/meta/sectest-gpe-image.bb @@ -1,11 +1,7 @@ MAINTAINER = "Bob Davies <tyggerbob@rogers.com>" LICENSE = MIT -PR = "r5" +PR = "r6" -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" -FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" export IMAGE_BASENAME = "sectest-gpe-image" diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb index 0854cfd43a..b878701c61 100644 --- a/packages/meta/task-e-x11.bb +++ b/packages/meta/task-e-x11.bb @@ -1,10 +1,7 @@ DESCRIPTION = "Tasks for Enlightenment/X11" PACKAGES = "task-e-x11-core task-e-x11" PROVIDES = "task-e-x11-core task-e-x11" -PR = "r8" - -FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ - e##http://openzaurus.org/official/unstable/3.5.2/feed/e" +PR = "r9" PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11" diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb index ad19539e6b..b679b4c380 100644 --- a/packages/otpkeygen/otpkeygen_1.3.0.bb +++ b/packages/otpkeygen/otpkeygen_1.3.0.bb @@ -5,7 +5,7 @@ AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>" MAINTANER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" APPTYPE="binary" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.bitrot.de/pub/otpkeygen/otpkeygen-src_${PV}.tar.gz" @@ -23,7 +23,7 @@ do_install() { install -d ${D}${palmtopdir}/bin/ install -d ${D}${palmtopdir}/pics/ - install -m 0755 ${WORKDIR}/bin/otpkeygen ${D}${palmtopdir}/bin/ + install -m 0755 ${WORKDIR}/src/src ${D}${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/apps/Applications/otpkeygen.desktop ${D}${palmtopdir}/apps/Applications/ install -m 0644 ${WORKDIR}/pics/otpkeygen.png ${D}${palmtopdir}/pics/ } diff --git a/packages/prism3-support/files/hostap-fw-load b/packages/prism3-support/files/hostap-fw-load index 0b2aec51a8..00df1ef848 100644 --- a/packages/prism3-support/files/hostap-fw-load +++ b/packages/prism3-support/files/hostap-fw-load @@ -1,11 +1,17 @@ #!/bin/sh +if test -e /sbin/cardctl; then + CARDCTL=/sbin/cardctl +elif test -e /sbin/pccardctl; then + CARDCTL=/sbin/pccardctl +else + exit 0 +fi + # Special case for prism3 cards needing firmware upload # Add more known manfids, if necessary - -test -x /sbin/cardctl || exit 0 -if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then +if [ `$CARDCTL info|grep "d601,0010\|d601,0101"` ]; then iwpriv "$IFACE" reset 1 hostap_fw_load "$IFACE" fi diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb index dfe3f5a9fb..85f1391ed4 100644 --- a/packages/prism3-support/prism3-support_1.0.0.bb +++ b/packages/prism3-support/prism3-support_1.0.0.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" DEPENDS = "prism3-firmware hostap-utils" RDEPENDS = "prism3-firmware hostap-utils" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r1" PACKAGE_ARCH = "all" +PR = "r2" SRC_URI = "file://hostap-fw-load" diff --git a/packages/zaurus-updater/tosa/updater.sh b/packages/zaurus-updater/tosa/updater.sh index 5adfa97a1e..6d30aba231 100644 --- a/packages/zaurus-updater/tosa/updater.sh +++ b/packages/zaurus-updater/tosa/updater.sh @@ -67,7 +67,7 @@ then ./consolescroll fi -for TARGETFILE in zImage zimage.bin ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN +for TARGETFILE in zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN mversion.bin MVERSION.BIN do if [ -e $TARGETFILE ] then diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 2aff497de1..5f1c7330a5 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r3" +PR = "r4" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zbedic/libbedic_0.9.6.bb b/packages/zbedic/libbedic_1.0.bb index 05f52ef1f6..8d0ead686d 100644 --- a/packages/zbedic/libbedic_0.9.6.bb +++ b/packages/zbedic/libbedic_1.0.bb @@ -5,9 +5,10 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/zbedic/misc" -PR = "r2" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz" + S = "${WORKDIR}" inherit palmtop @@ -17,7 +18,10 @@ export OE_QMAKE_CXXFLAGS="-fexceptions -fno-rtti ${CXXFLAGS}" do_configure() { qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib -after \ INCLUDEPATH+=../include TARGET=bedic DESTDIR=${STAGING_LIBDIR} \ - HEADERS+=src/file.h SOURCES+=src/file.cpp SOURCES-=tools/xerox.cpp CXXFLAGS+=-fexceptions + HEADERS+=src/file.h SOURCES+=src/file.cpp SOURCES-=tools/xerox.cpp \ + SOURCES-=src/test_dynamic_dictionary.cpp \ + SOURCES-=src/test_dynamic_database.cpp \ + CXXFLAGS+=-fexceptions } do_stage() { diff --git a/packages/zbedic/zbedic/.mtn2git_empty b/packages/zbedic/zbedic/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zbedic/zbedic/.mtn2git_empty diff --git a/packages/zbedic/zbedic-0.9.6/opie-icons.patch b/packages/zbedic/zbedic/opie-icons.patch index 7fbebd77b5..1e028d5210 100644 --- a/packages/zbedic/zbedic-0.9.6/opie-icons.patch +++ b/packages/zbedic/zbedic/opie-icons.patch @@ -1,6 +1,8 @@ ---- src/zbedic.cpp.orig 2005-06-22 22:31:49.000000000 +0200 -+++ src/zbedic.cpp 2005-06-28 13:27:34.000000000 +0200 -@@ -128,9 +128,9 @@ +Index: zbedic/src/zbedic.cpp +=================================================================== +--- zbedic.orig/src/zbedic.cpp 2006-03-15 11:24:12.000000000 +0100 ++++ zbedic/src/zbedic.cpp 2006-03-15 11:30:21.000000000 +0100 +@@ -129,9 +129,9 @@ // ========== create actions action[TB_SwitchDictionaries] = createAction( tr( "Switch dictionaries" ), "zbedic/switch_dictionary", SLOT(switchToPreviousDict()), CTRL+Key_S ); diff --git a/packages/zbedic/zbedic-0.9.6/qtopia17.patch b/packages/zbedic/zbedic/qtopia17.patch index 0c24974247..7b890aab8d 100644 --- a/packages/zbedic/zbedic-0.9.6/qtopia17.patch +++ b/packages/zbedic/zbedic/qtopia17.patch @@ -3,8 +3,8 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- src/main.cpp~compilefix -+++ src/main.cpp +--- zbedic/src/main.cpp~compilefix ++++ zbedic/src/main.cpp @@ -25,5 +25,13 @@ #include "zbedic.h" #include <qtopia/qpeapplication.h> diff --git a/packages/zbedic/zbedic/version.patch b/packages/zbedic/zbedic/version.patch new file mode 100644 index 0000000000..913e201dc7 --- /dev/null +++ b/packages/zbedic/zbedic/version.patch @@ -0,0 +1,13 @@ +Index: zbedic/src/settings.cpp +=================================================================== +--- zbedic.orig/src/settings.cpp 2006-03-15 11:24:11.000000000 +0100 ++++ zbedic/src/settings.cpp 2006-03-15 15:03:55.000000000 +0100 +@@ -117,7 +117,7 @@ + + ZBEDicSettings::ZBEDicSettings( QWidget *parent ): QTabDialog( parent, "options", true ) + { +- setCaption( tr( "ZBEDic Settings (v. " VERSION ")" ) ); ++ setCaption( tr( "ZBEDic Settings (v. 1.0)" ) ); + + } + diff --git a/packages/zbedic/zbedic_0.9.6.bb b/packages/zbedic/zbedic_1.0.bb index df811a7fcc..d7218a241d 100644 --- a/packages/zbedic/zbedic_0.9.6.bb +++ b/packages/zbedic/zbedic_1.0.bb @@ -6,20 +6,23 @@ LICENSE = "GPL" DEPENDS = "libbedic" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/misc" -PR = "r2" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ -file://qtopia17.patch;patch=1;pnum=0 \ -file://opie-icons.patch;patch=1;pnum=0 " + file://opie-icons.patch;patch=1 \ + file://version.patch;patch=1 \ + file://qtopia17.patch;patch=1" -S = "${WORKDIR}/" +S = "${WORKDIR}" inherit opie export OE_QMAKE_LINK="${CXX}" + do_configure() { cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \ - INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS LIBS+=-lqpe LIBS+=-lbedic DESTDIR=${S} TARGET=zbedic + INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \ + LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic } do_install() { @@ -27,7 +30,7 @@ do_install() { install -d ${D}${palmtopdir}/help/html/ # we copy small icons - in other way QVGA users will complain install -m 0644 ${S}/misc/small_icons/*.png ${D}${palmtopdir}/pics/zbedic/ - install -m 0644 ${S}/misc/zbedic.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}/misc/large_icons/zbedic.png ${D}${palmtopdir}/pics/ install -m 0644 ${S}/doc/manual/*.html ${D}${palmtopdir}/help/html/ rm ${D}${palmtopdir}/pics/zbedic/zbedic.png |