diff options
49 files changed, 384 insertions, 65 deletions
diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf index e46796fede..535c914a9d 100644 --- a/conf/machine/include/tune-iwmmxt.conf +++ b/conf/machine/include/tune-iwmmxt.conf @@ -1,6 +1,6 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. IPKG_EXTRA_ARCHS += "iwmmxt" -TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt" +TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt " PACKAGE_ARCH = "iwmmxt" diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 24e23bc9a0..206958c2ce 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -7,8 +7,9 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5" GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" +IPKG_EXTRA_ARCHS = "armv4 armv5te" -include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" @@ -16,4 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" # EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000" +EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000" + diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index de242242a7..357e286752 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" @@ -18,6 +18,3 @@ SERIAL_CONSOLE = "115200 ttyS0" ROOT_FLASH_SIZE = "32" - - - diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index c222edb817..cf69b090c4 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -10,7 +10,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" REALPV = "1.0rc" -PR = "r0" +PR = "r1" ###################################################################################### @@ -51,7 +51,7 @@ FILES_${PN}-doc = "/usr/share/man" ###################################################################################### -inherit autotools update-alternatives +inherit autotools ###################################################################################### @@ -73,7 +73,10 @@ do_install_append() { ###################################################################################### -ALTERNATIVE_PATH_${PN}-gpe = "${bindir}/fluxbox-gpe-session" -ALTERNATIVE_NAME_${PN}-gpe = "x-window-manager" -ALTERNATIVE_LINK_${PN}-gpe = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY_${PN}-gpe = "15" +pkg_postinst_${PN}-gpe() { + update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 +} + +pkg_postrm_${PN}-gpe() { + update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session +} diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb index 552fc7def5..a0bec2b70f 100644 --- a/packages/gpe-conf/gpe-conf_cvs.bb +++ b/packages/gpe-conf/gpe-conf_cvs.bb @@ -2,13 +2,11 @@ DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" PV = "0.1.29+cvs${SRCDATE}" -PR = "r1" +PR = "r2" -inherit gpe +inherit autotools gpe -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN} \ - file://Makefile.dpkg_ipkg \ - file://Makefile.translation" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" PACKAGES = "gpe-conf gpe-conf-panel" LICENSE = "GPL" @@ -25,17 +23,3 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ ${datadir}/gpe-conf" FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile - mkdir build - cp ${WORKDIR}/Makefile.* build/ - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program -} - - diff --git a/packages/gpe-contacts/gpe-contacts_0.36.bb b/packages/gpe-contacts/gpe-contacts_0.36.bb deleted file mode 100644 index 28e93b48b0..0000000000 --- a/packages/gpe-contacts/gpe-contacts_0.36.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -PR = "r0" - -DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE contacts manager" - -FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" - diff --git a/packages/gpe-contacts/gpe-contacts_0.42.bb b/packages/gpe-contacts/gpe-contacts_0.45.bb index 32103b1867..b5afbb3a3c 100644 --- a/packages/gpe-contacts/gpe-contacts_0.42.bb +++ b/packages/gpe-contacts/gpe-contacts_0.45.bb @@ -1,10 +1,9 @@ LICENSE = "GPL" -MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" inherit gpe autotools PR = "r0" -DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" SECTION = "gpe" RDEPENDS = "gpe-icons" DESCRIPTION = "GPE contacts manager" diff --git a/packages/hping/.mtn2git_empty b/packages/hping/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hping/.mtn2git_empty diff --git a/packages/hping/files/.mtn2git_empty b/packages/hping/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hping/files/.mtn2git_empty diff --git a/packages/hping/files/hping2_configure.patch b/packages/hping/files/hping2_configure.patch new file mode 100644 index 0000000000..90795ab0e0 --- /dev/null +++ b/packages/hping/files/hping2_configure.patch @@ -0,0 +1,75 @@ +Allow the byteorder and target os type to be specified via +environment variables when running the configured shell script, don't +try and run the resultant binary after building it, don't set various +compiler related environment varibles - we'll let OE set those. + +diff -dur hping2-rc3-orig/configure hping2-rc3/configure +--- hping2-rc3-orig/configure 2005-12-03 19:04:44.000000000 +1100 ++++ hping2-rc3/configure 2005-12-03 19:05:58.000000000 +1100 +@@ -13,16 +13,19 @@ + exit 0 + fi + +-CC=${CC:=cc} ++if [ "x$BYTEORDER" = "x" ]; then ++ CC=${CC:=cc} + +-echo build byteorder.c... +-$CC byteorder.c -o byteorder || exit 1 ++ echo build byteorder.c... ++ $CC byteorder.c -o byteorder || exit 1 ++ ++ BYTEORDER=`./byteorder -m` ++fi + + INSTALL_MANPATH=`echo $MANPATH|cut -f1 -d:` + if [ "$INSTALL_MANPATH" = "" ]; then + INSTALL_MANPATH="/usr/local/man" + fi +-BYTEORDER=`./byteorder -m` + + echo create byteorder.h... + cat > byteorder.h <<EOF +@@ -38,7 +41,9 @@ + #endif /* __BYTEORDER_H */ + EOF + +-CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]` ++if [ "x$CONFIGOSTYPE" = "x" ]; then ++ CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]` ++fi + if [ ! "$CONFIGOSTYPE" ]; then + CONFIGOSTYPE=UNKNOWN + fi +diff -dur hping2-rc3-orig/Makefile.in hping2-rc3/Makefile.in +--- hping2-rc3-orig/Makefile.in 2005-12-03 19:04:44.000000000 +1100 ++++ hping2-rc3/Makefile.in 2005-12-03 19:05:41.000000000 +1100 +@@ -6,17 +6,6 @@ + # $date: Sun Jul 25 17:56:15 MET DST 1999$ + # $rev: 3$ + +-CC= gcc +-AR=/usr/bin/ar +-RANLIB=/usr/bin/ranlib +-CCOPT= -O2 -Wall @PCAP_INCLUDE@ +-DEBUG= -g +-#uncomment the following if you need libpcap based build under linux +-#(not raccomanded) +-COMPILE_TIME= @FORCE_LIBPCAP@ +-INSTALL_MANPATH=@MANPATH@ +-@PCAP@ +- + OBJ= main.o getifname.o getlhs.o \ + linux_sockpacket.o parseoptions.o datafiller.o \ + datahandler.o gethostname.o \ +@@ -44,10 +33,6 @@ + + hping2: byteorder.h $(OBJ) + $(CC) -o hping2 $(CCOPT) $(DEBUG) $(OBJ) $(PCAP) @SOLARISLIB@ +- @echo +- ./hping2 -v +- @echo "use \`make strip' to strip hping2 binary" +- @echo "use \`make install' to install hping2" + + byteorder.h: + ./configure diff --git a/packages/hping/files/hping2_debian.patch b/packages/hping/files/hping2_debian.patch new file mode 100644 index 0000000000..4edc893896 --- /dev/null +++ b/packages/hping/files/hping2_debian.patch @@ -0,0 +1,168 @@ +The following minor changes were taken from the debian hping2 package: + +--- hping2-2.rc3.orig/antigetopt.c ++++ hping2-2.rc3/antigetopt.c +@@ -140,7 +140,7 @@ + #define UNK_LONG_ERRSTRING "unrecognized option `--%s'\n" + #define ARG_SHORT_ERRSTRING "option requires an argument -- %c\n" + #define ARG_LONG_ERRSTRING "option `--%s' requires an argument\n" +-#define AMB_ERRSTRING "option `--%s' is ambiguos\n" ++#define AMB_ERRSTRING "option `--%s' is ambiguous\n" + #define IERR_ERRSTRING "internal error. ago_gnu_error() called with " \ + "a bad error code (%d)\n" + void ago_gnu_error(char *pname, int error) +--- hping2-2.rc3.orig/bytesex.h ++++ hping2-2.rc3/bytesex.h +@@ -7,16 +7,11 @@ + #ifndef ARS_BYTESEX_H + #define ARS_BYTESEX_H + +-#if defined(__i386__) \ +- || defined(__alpha__) \ +- || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) ++#include <endian.h> ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define BYTE_ORDER_LITTLE_ENDIAN +-#elif defined(__mc68000__) \ +- || defined (__sparc__) \ +- || defined (__sparc) \ +- || defined (__PPC__) \ +- || defined (__BIG_ENDIAN__) \ +- || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define BYTE_ORDER_BIG_ENDIAN + #else + # error can not find the byte order for this architecture, fix bytesex.h +--- hping2-2.rc3.orig/getlhs.c ++++ hping2-2.rc3/getlhs.c +@@ -55,6 +55,12 @@ + case DLT_IEEE802_11: + linkhdr_size = 14; + break; ++ case DLT_IEEE802_11: ++ linkhdr_size = 14; ++ break; ++ case DLT_TOKEN_RING: ++ linkhdr_size = 20; ++ break; + case DLT_ATM_RFC1483: + #ifdef DLT_CIP + case DLT_CIP: +@@ -105,6 +111,15 @@ + } else if ( strstr(ifname, "wlan") ) { + linkhdr_size = WLANHDR_SIZE; + return 0; ++ } else if (strstr(ifname, "atm")) { ++ linkhdr_size = 0; ++ return 0; ++ } else if ( strstr(ifname, "wlan") ) { ++ linkhdr_size = WLANHDR_SIZE; ++ return 0; ++ } else if ( strstr(ifname, "tr") ) { ++ linkhdr_size = TRHDR_SIZE; ++ return 0; + } + else + return -1; +--- hping2-2.rc3.orig/listen.c ++++ hping2-2.rc3/listen.c +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #include <sys/types.h> +--- hping2-2.rc3.orig/main.c ++++ hping2-2.rc3/main.c +@@ -26,6 +26,7 @@ + #include <time.h> + #include <sys/time.h> + #include <sys/types.h> ++#include <time.h> + + #include "hping2.h" + +--- hping2-2.rc3.orig/resolve.c ++++ hping2-2.rc3/resolve.c +@@ -12,6 +12,7 @@ + #include <sys/types.h> + #include <netdb.h> + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <sys/socket.h> + #include <netinet/in.h> +--- hping2-2.rc3.orig/sendicmp.c ++++ hping2-2.rc3/sendicmp.c +@@ -19,6 +19,7 @@ + #include <string.h> + #include <signal.h> + #include <errno.h> ++#include <time.h> + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendtcp.c ++++ hping2-2.rc3/sendtcp.c +@@ -15,6 +15,8 @@ + #include <sys/time.h> + #include <unistd.h> + #include <signal.h> ++#include <errno.h> ++#include <time.h> + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendudp.c ++++ hping2-2.rc3/sendudp.c +@@ -15,6 +15,8 @@ + #include <sys/time.h> + #include <unistd.h> + #include <signal.h> ++#include <errno.h> ++#include <time.h> + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/statistics.c ++++ hping2-2.rc3/statistics.c +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "hping2.h" + #include "globals.h" +@@ -33,7 +34,7 @@ + lossrate = 100; + + fprintf(stderr, "\n--- %s hping statistic ---\n", targetname); +- fprintf(stderr, "%d packets tramitted, %d packets received, " ++ fprintf(stderr, "%d packets transmitted, %d packets received, " + "%d%% packet loss\n", sent_pkt, recv_pkt, lossrate); + if (out_of_sequence_pkt) + fprintf(stderr, "%d out of sequence packets received\n", +--- hping2-2.rc3.orig/usage.c ++++ hping2-2.rc3/usage.c +@@ -12,6 +12,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + + void show_usage(void) + { +--- hping2-2.rc3.orig/version.c ++++ hping2-2.rc3/version.c +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "release.h" + #include "hping2.h" diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb new file mode 100644 index 0000000000..912f7c420e --- /dev/null +++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "hping is a command-line oriented TCP/IP packet \ +assembler/analyzer. The interface is inspired to the ping(8) \ +unix command, but hping isn't only able to send ICMP echo requests. \ +It supports TCP, UDP, ICMP and RAW-IP protocols, has a traceroute \ +mode, the ability to send files between a covered channel, and many \ +other features." +HOMEPAGE = "http://www.hping.org/" +SECTION = "console/network" +MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \ + file://hping2_debian.patch;patch=1 \ + file://hping2_configure.patch;patch=1" +S="${WORKDIR}/hping2-rc3" + +# +# We've patched configure to accept byte order and ostype as env +# variables Pass those values in to stop it trying to figure it out +# by itself. +# NOTE: The configure script is not an autoconf script. +# +do_configure() { + # endianness fun.. inspired by openssl.inc + . ${CONFIG_SITE} + BYTEORDER="UNKNOWN" + if test "x$ac_cv_c_bigendian" = "xyes"; then + BYTEORDER="__BIG_ENDIAN_BITFIELD" + elif test "x$ac_cv_c_littleendian" = "xyes"; then + BYTEORDER="__LITTLE_ENDIAN_BITFIELD" + else + oefatal do_configure cannot determine endianess + fi + BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure +} + +# +# Instead of patching the install we do things manually here +# +do_install() { + install -m 0755 -d ${D}${sbindir} ${D}/${mandir} ${D}${docdir}/hping2 + install -m 0755 hping2 ${D}/${sbindir} + install -m 0644 docs/hping2.8 ${D}/${mandir} + install -m 0644 docs/HPING2-HOWTO.txt docs/HPING2-IS-OPEN \ + docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt \ + docs/AS-BACKDOOR docs/APD.txt ${D}${docdir}/hping2 +} diff --git a/packages/libcontactsdb/libcontactsdb_0.4.bb b/packages/libcontactsdb/libcontactsdb_0.4.bb new file mode 100644 index 0000000000..93950a3e1c --- /dev/null +++ b/packages/libcontactsdb/libcontactsdb_0.4.bb @@ -0,0 +1,15 @@ +LICENSE = "LGPL" +DESCRIPTION = "Database access library for GPE contacts" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "libgpewidget libgpepimc sqlite" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +PR = "r0" +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools gpe pkgconfig + +do_stage () { +autotools_stage_all +} diff --git a/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb index 48d468462b..374936deea 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb @@ -4,6 +4,8 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb index 0b55dc8a53..4c7a1bba52 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" PR="r1" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb index 6c69b548d0..2c01ca91f8 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb index 03169de305..81b63d5021 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" # KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb index 35de9cff9b..58a8eff2cb 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" # KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" DEFCONFIG = "defconfig-${MACHINE}_2.6.8.1-hh0" diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index bcf502d52f..1581a444b6 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -6,6 +6,7 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" PR = "r3" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb index 2f1a05a3bd..2d9eccfd83 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb @@ -6,6 +6,7 @@ PR = "r2" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-ipaqpxa \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb index 02575213ad..d0b2afe75d 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb @@ -6,6 +6,7 @@ PR = "r7" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb index c10d058160..034f2ca055 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb @@ -6,6 +6,7 @@ PR = "r4" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb index dce837db02..6bf75de349 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb @@ -6,6 +6,7 @@ PR = "r0" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb index 9fd7f0ba5e..7bdb445312 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb @@ -6,6 +6,7 @@ PR = "r1" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb index 319324dac8..32068528aa 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb @@ -8,6 +8,7 @@ DEFAULT_PREFERENCE="-1" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb index 5daabd127c..bdc2f86633 100644 --- a/packages/linux/handhelds-sa-2.6_cvs.bb +++ b/packages/linux/handhelds-sa-2.6_cvs.bb @@ -4,6 +4,7 @@ MAINTAINER = "Alex Lange <chicken@handhelds.org>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb index 9089678fdc..9e53e0394c 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb @@ -6,6 +6,7 @@ PR = "r3" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb index b4850a24de..9dc6f5fa50 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb @@ -6,6 +6,7 @@ PR = "r3" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb index df160cd1ed..240e52ccc2 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb @@ -6,6 +6,7 @@ PR = "r6" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb index 3abb8719c5..a3d54d1319 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb @@ -7,6 +7,7 @@ DEFAULT_PREFERENCE = "-1" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb index fd5d161cc1..40cf007174 100644 --- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb @@ -8,6 +8,8 @@ PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}" PR = "r22" +COMPATIBLE_MACHINE = 'simpad' + FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb index fff45f20e9..51fabecd75 100644 --- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb @@ -9,6 +9,8 @@ JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}" USBV= "usb20040610" PR = "r4" +COMPATIBLE_MACHINE = 'simpad' + FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ diff --git a/packages/qpf-fonts/qpf-dejavusans_2.2.bb b/packages/qpf-fonts/qpf-dejavusans_2.7.bb index 3428d98a89..3428d98a89 100644 --- a/packages/qpf-fonts/qpf-dejavusans_2.2.bb +++ b/packages/qpf-fonts/qpf-dejavusans_2.7.bb diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb index 7494374023..7494374023 100644 --- a/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb +++ b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb diff --git a/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb index 51c9e1b925..51c9e1b925 100644 --- a/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb +++ b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb diff --git a/packages/qpf-fonts/qpf-dejavuserif_2.2.bb b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb index 81009e8a8c..81009e8a8c 100644 --- a/packages/qpf-fonts/qpf-dejavuserif_2.2.bb +++ b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb index db31216907..db31216907 100644 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh index ba8bc7e584..ea3ff24593 100644 --- a/packages/scap/files/scap.sh +++ b/packages/scap/files/scap.sh @@ -2,7 +2,7 @@ sleep 2 if [ -x /usr/bin/bl ]; then - bl toggle + bl off fi MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"` test -e /etc/scap.conf && USER=`cat /etc/scap.conf` @@ -15,6 +15,6 @@ RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` echo "" cat /dev/fb0) | nc www.handhelds.org 80 if [ -x /usr/bin/bl ]; then - bl toggle + bl on fi diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 7bef893e59..9ba295a7a5 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r4" +PR = "r5" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" diff --git a/packages/ttf-fonts/ttf-dejavu_2.3.bb b/packages/ttf-fonts/ttf-dejavu_2.7.bb index 304b30cfd6..304b30cfd6 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.3.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.7.bb diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb new file mode 100644 index 0000000000..7cd0261827 --- /dev/null +++ b/packages/zip/zip-native_2.32.bb @@ -0,0 +1,9 @@ +SECTION = "console/utils" +inherit native +include zip_${PV}.bb +S = "${WORKDIR}/zip-${PV}" + +do_stage() { + install -d ${STAGING_BINDIR} + install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} +} diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc new file mode 100644 index 0000000000..b66b4b217f --- /dev/null +++ b/packages/zip/zip.inc @@ -0,0 +1,16 @@ +SECTION = "console/utils" +SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" +LICENSE = "Info-ZIP" +EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ + 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ + 'BINFLAGS=0755' 'INSTALL_D=install -d'" + +do_compile() { + oe_runmake -f unix/Makefile generic +} + +do_install() { + oe_runmake -f unix/Makefile prefix=${D}${prefix} \ + BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ + install +} diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb index 6c588a55e5..d10bb4312e 100644 --- a/packages/zip/zip_2.31.bb +++ b/packages/zip/zip_2.31.bb @@ -1,17 +1,2 @@ -SECTION = "console/utils" -SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz" -LICENSE = "Info-ZIP" -EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ - 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ - 'BINFLAGS=0755' 'INSTALL_D=install -d'" - -do_compile() { - oe_runmake -f unix/Makefile generic -} - -do_install() { - oe_runmake -f unix/Makefile prefix=${D}${prefix} \ - BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ - install -} - +include zip.inc +PR="r0" diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb new file mode 100644 index 0000000000..d10bb4312e --- /dev/null +++ b/packages/zip/zip_2.32.bb @@ -0,0 +1,2 @@ +include zip.inc +PR="r0" |