diff options
65 files changed, 1024 insertions, 265 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 3fb2d04a81..bc72ea5b3b 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -21,7 +21,7 @@ # We play a special package function inherit package -PACKAGE_DEPENDS += "pax-utils-native" +PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native" #PACKAGE_DEPENDS += chrpath-native" PACKAGEFUNCS += " do_package_qa " @@ -308,8 +308,22 @@ def package_qa_check_pcla(path,name,d): .pc and .la files should not point to the WORKDIR """ sane = True + # TODO return sane +def package_qa_check_desktop(path, name, d): + """ + Run all desktop files through desktop-file-validate. + """ + import bb, os + if path.endswith(".desktop"): + validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate') + output = os.popen("%s %s" % (validate, path)) + # This only produces output on errors + for l in output: + bb.error(l.strip()) + return True + def package_qa_check_staged(path,d): """ Check staged la and pc files for sanity @@ -416,9 +430,13 @@ python do_package_qa () { walk_sane = True rdepends_sane = True for package in packages.split(): + if bb.data.getVar('INSANE_SKIP_' + package, d, True): + bb.note("Package: %s (skipped)" % package) + continue + bb.note("Checking Package: %s" % package) path = "%s/install/%s" % (workdir, package) - if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d): + if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d): walk_sane = False if not package_qa_check_rdepends(package, workdir, d): rdepends_sane = False diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index e5db7a9ceb..ccd458da89 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}" SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" +SRCDATE_python-emotion ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 864f6fe178..5cccb4a681 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,9 +48,9 @@ SRCREV_pn-matchbox-desktop-2 ?= "1778" SRCREV_pn-matchbox-keyboard ?= "1739" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_pn-moko-gtk-engine ?= "3207" +SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-neod ?= "3358" +SRCREV_pn-neod ?= "3421" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -69,7 +69,7 @@ SRCREV_pn-openmoko-contacts2 ?= "358" SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "659" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3361" +SRCREV_pn-openmoko-dialer2 ?= "3306" SRCREV_pn-openmoko-feedreader2 ?= "3080" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" @@ -81,6 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "3300" SRCREV_pn-openmoko-messages ?= "2276" +SRCREV_pn-openmoko-messages2 ?= "3424" SRCREV_pn-openmoko-panel-battery ?= "3360" SRCREV_pn-openmoko-panel-bt ?= "2896" SRCREV_pn-openmoko-panel-clock ?= "2567" @@ -105,7 +106,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "3289" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289" SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "3342" -SRCREV_pn-openmoko-today2-folders ?= "2680" +SRCREV_pn-openmoko-today2-folders ?= "3414" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 758f6c612f..f2007c231f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -24,10 +24,12 @@ PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \ + snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \ snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \ \ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \ + updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \ updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 " # 2.18 seems to break badly on 64-bit systems diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index d70db72f38..d8ea4b8890 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,9 +6,6 @@ require conf/machine/include/zaurus-2.6.inc IMAGE_FSTYPES ?= "jffs2" -# newer kernels does not build -PREFERRED_VERSION_linux-rp = "2.6.17" - # wlan-ng Modules MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb" diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc index e1999b066f..c4a9fc0fc3 100644 --- a/contrib/feed-browser/includes/config.inc +++ b/contrib/feed-browser/includes/config.inc @@ -139,4 +139,163 @@ $feeds = array( ) ); -?> + +$ipkpath = "/var/www/angstrom/unstable/feed/unsorted"; +$cpu_archs = array('arm-oabi', 'armv4', 'armv4t', 'armv5te', 'armv6', 'armv7', 'avr32', 'bfin', 'i386', 'i486', 'i586', 'i686', 'iwmmxt', 'ppc405', 'ppc603e', 'sparc'); +$device_archs = array( + "a1200" => "armv5te", + "a780"=> "armv5te", + "acern30", + "adsp-bf537-stamp" => "bfin", + "adzs-bf538f-ezlite" => "bfin", + "akita" => "armv5te", + "alix", + "amsdelta", + "asus620", + "asus730", + "at32stk1000" => "avr32", + "at91sam9260ek" => "armv5te", + "at91sam9261ek" => "armv5te", + "at91sam9263ek" => "armv5te", + "atngw100" => "avr32", + "aximx50" => "armv5te", + "aximx50v" => "armv5te", + "borzoi" => "armv5te", + "boxer" => "armv5te", + "c7x0" => "armv5te", + "colinux", + "collie", + "compulab-pxa270" => "armv5te", + "corgi" => "armv5te", + "davinci-dvevm", + "db1200", + "devkitidp-pxa255" => "armv5te", + "dht-walnut" => "ppc405", + "e680" => "armv5te", + "efika" => "ppc603e", + "ep93xx" => "armv4t", + "epia", + "er0100" => "armv5te", + "eteng500" => "armv5te", + "fic-gta01" => "armv4t", + "fic-gta02" => "armv4t", + "fsg3be", + "geodegx", + "geodelx", + "guinness", + "gumstix-connex" => "armv5te", + "gumstix-verdex" => "armv5te", + "h1910", + "h1940", + "h2200" => "armv5te", + "h3600" => "arm-oabi", + "h3800" => "arm-oabi", + "h3900" => "armv5te", + "h4000" => "armv5te", + "h5000" => "armv5te", + "h6300" => "armv4t", + "htcalpine", + "htcapache", + "htcblueangel", + "htchimalaya", + "htcsable", + "htctornado", + "htcuniversal" => "armv5te", + "htcwallaby", + "husky" => "armv5te", + "hx2000" => "armv5te", + "hx4700" => "armv5te", + "i586-generic" => "i586", + "i686-generic" => "i586", + "ixp4xx", + "ixp4xxbe" => "armv5teb", + "ixp4xxle" => "armv5te", + "jornada56x", + "jornada6xx", + "jornada7xx", + "kb9202" => "armv4t", + "ks8695", + "lite5200", + "logicpd-pxa270" => "armv5te", + "looxc550", + "lsarm", + "lsppchd", + "lsppchg", + "magicbox", + "magician" => "armv5te", + "mainstone" => "armv5te", + "mnci", + "mtx-1", + "mtx-2", + "mtx-3", + "mtx-3a", + "mx21ads" => "armv5te", + "mx31ads" => "armv6", + "n2100", + "native", + "navman-icn330", + "netbook-pro" => "armv5te", + "netvista", + "nokia770" => "armv5te", + "nokia800", + "nslu2" => "armv5te", + "nslu2be" => "armv5teb", + "nslu2le" => "armv5te", + "omap1510inn" => "armv5te", + "omap1610h2" => "armv5te", + "omap1710h3" => "armv5te", + "omap2420h4", + "omap2430sdp", + "omap5912osk" => "armv5te", + "palmld" => "armv5te", + "palmt650" => "armv5te", + "palmt680", + "palmtc", + "palmtt", + "palmtt2", + "palmtt3", + "palmtt5", + "palmtx", + "palmz31", + "palmz71", + "palmz72", + "poodle" => "armv5te", + "progear", + "qemuarm" => "armv5te", + "qemux86", + "rb500", + "rokre2" => "armv5te", + "rokre6" => "armv5te", + "rt3000", + "rx1950", + "rx3000", + "sarge-at91" => "armv4t", + "sequoia", + "shark" => "arm-oabi", + "shepherd" => "armv5te", + "simpad" => "arm-oabi", + "smdk2440" => "armv4t", + "smdk2443" => "armv4t", + "spitz" => "armv5te", + "storcenter", + "sun4cdm", + "terrier" => "armv5te", + "titan", + "tosa" => "armv5te", + "triton", + "ts72xx", + "turbostation", + "wgt634u", + "wl500g", + "wrap", + "wrt54", + "x86-32-nocona", + "x86-prescott", + "x86-uml", + "x86", + "xilinx-ml403", + "xilinx-ml410", + "xxs1500", + ); + +?> diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab index 8a2b07a089..46b778600e 100644 --- a/packages/base-files/base-files/akita/fstab +++ b/packages/base-files/base-files/akita/fstab @@ -8,12 +8,12 @@ tmpfs /media/ram tmpfs defaults 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.6 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 # USB Storage /dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 -usbfs /proc/bus/usb usbf defaults 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab index c3de8d28dc..54fe556905 100644 --- a/packages/base-files/base-files/c7x0/fstab +++ b/packages/base-files/base-files/c7x0/fstab @@ -8,6 +8,6 @@ tmpfs /media/ram tmpfs defaults 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 # SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.6 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab index a3a9ea2df1..c2e3f3c189 100644 --- a/packages/base-files/base-files/collie/fstab +++ b/packages/base-files/base-files/collie/fstab @@ -1,9 +1,13 @@ /dev/mtdblock4 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0 -/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk #tmpfs /media/ram tmpfs defaults 0 0 + +# SD/MMC in kernel 2.4 +#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +# SD/MMC in kernel 2.6 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 9f87b91155..64076fa181 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/packages/base-files/base-files/poodle/fstab @@ -7,7 +7,7 @@ proc /proc proc defaults 0 0 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index f266212135..dc419e62be 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -12,7 +12,7 @@ tmpfs /dev/shm tmpfs mode=0777 0 0 # Compact Flash memory cards /dev/hdc1 /media/cf auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.6 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index 8607c79be8..badbebe1f7 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/packages/base-files/base-files/tosa/fstab @@ -10,6 +10,6 @@ tmpfs /dev/shm tmpfs mode=0777 0 0 usbfs /proc/bus/usb usbfs auto 0 0 # SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.6 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 7ccd26b5cf..98b522c1bd 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r74" +PR = "r75" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb b/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb new file mode 100644 index 0000000000..9603982ea6 --- /dev/null +++ b/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb @@ -0,0 +1,12 @@ +SECTION = "console/utils" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils" +DESCRIPTION = "command line utilities to work with *.desktop files" +LICENSE = "GPL" + +DEPENDS = "glib-2.0-native" + +SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz" + +inherit autotools native + +S = "${WORKDIR}/desktop-file-utils-${PV}" diff --git a/packages/ettercap/ettercap-0.6.b/configure.patch b/packages/ettercap/ettercap-0.6.b/configure.patch deleted file mode 100644 index 89132125b8..0000000000 --- a/packages/ettercap/ettercap-0.6.b/configure.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/acinclude.m4 Thu Jul 10 03:25:31 2003 -+++ ettercap-0.6.b/acinclude.m4 Thu Nov 6 18:25:39 2003 -@@ -182,9 +182,11 @@ - dnl HAVE_SOCKLEN_T - dnl - --AC_DEFUN(EC_SOCKLEN_CHECK, -- [AC_MSG_CHECKING(for socklen_t in sys/socket.h) -+samba_cv_socklen_t - -+AC_DEFUN(EC_SOCKLEN_CHECK, -+ [AC_CACHE_CHECK([for socklen_t in sys/socket.h], -+ [ettercap_cv_type_socklen_t], - AC_TRY_RUN([ - #include <sys/types.h> - #include <sys/socket.h> -@@ -197,14 +199,12 @@ - return 0; - } - ], -- [ AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_SOCKLEN_T) -- ], -- AC_MSG_RESULT(no); -- , -- AC_MSG_RESULT(unkown when cross-compiling) -- ) -+ [ettercap_cv_type_socklen_t=yes], -+ [ettercap_cv_type_socklen_t=no])) - -+ if test X$ettercap_cv_type_socklen_t = Xyes; then -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ fi - ]) - - -@@ -377,24 +377,78 @@ - - AC_DEFUN(EC_NS_GET,[ - -- AC_MSG_CHECKING(for NS_GET32) -- AC_TRY_RUN([ -- #include <arpa/nameser.h> -+AC_CACHE_CHECK([for NS_GET32], -+ ec_cv_func_ns_get32, -+ [AC_TRY_LINK([ -+ #include <arpa/nameser.h> -+ ], -+ [ -+ int i; -+ char *p = "\x01\x02\x03\x04"; -+ NS_GET32(i, p); -+ ], -+ ec_cv_func_ns_get32=yes, -+ ec_cv_func_ns_get32=no) -+ if test X$ec_cv_func_ns_get32 = Xyes; then -+ AC_DEFINE(HAVE_NS_GET,1) -+ fi]) -+]) - -- int main() -- { -- int i; -- char *p = "\x01\x02\x03\x04"; -- NS_GET32(i, p); -+dnl vim:ts=3:expandtab - -- return 0; -- } -- ], -- [ AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_NS_GET,1) ], -- [ AC_MSG_RESULT(no); ] -- ) -+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -+dnl also defines GSTUFF_PKG_ERRORS on error -+AC_DEFUN(PKG_CHECK_MODULES, [ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ AC_MSG_CHECKING(for $2) -+ -+ if $PKG_CONFIG --exists "$2" ; then -+ AC_MSG_RESULT(yes) -+ succeeded=yes -+ -+ AC_MSG_CHECKING($1_CFLAGS) -+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -+ AC_MSG_RESULT($$1_CFLAGS) -+ -+ AC_MSG_CHECKING($1_LIBS) -+ $1_LIBS=`$PKG_CONFIG --libs "$2"` -+ AC_MSG_RESULT($$1_LIBS) -+ else -+ $1_CFLAGS="" -+ $1_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ ifelse([$4], ,echo $$1_PKG_ERRORS,) -+ fi -+ -+ AC_SUBST($1_CFLAGS) -+ AC_SUBST($1_LIBS) -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi - -+ if test $succeeded = yes; then -+ ifelse([$3], , :, [$3]) -+ else -+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -+ fi - ]) - --dnl vim:ts=3:expandtab -+ ---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/configure.in Thu Jul 10 03:25:31 2003 -+++ ettercap-0.6.b/configure.in Thu Nov 6 18:13:44 2003 -@@ -20,9 +20,10 @@ - dnl $Id: configure.in,v 1.69 2003/06/30 19:57:41 alor Exp $ - dnl - --AC_PREREQ([2.50]) -+AC_PREREQ(2.57) - --AC_INIT(src/ec_main.c) -+AC_INIT -+AC_CONFIG_SRCDIR([src/ec_main.c]) - AC_CONFIG_HEADER(config.h) - - echo "char configure_line[[]] = \"$0 $*\";" > ./src/include/ec_debug_info.h -@@ -77,7 +78,7 @@ - dnl Check the OS - dnl ================ - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - case "$target_os" in - *linux*) - EC_LINUX_KERNEL() -@@ -868,7 +869,8 @@ - - AC_SUBST(MAKEPLUG) - --AC_OUTPUT(ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi) -+AC_CONFIG_FILES([ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi]) -+AC_OUTPUT - - dnl ============================ - dnl FOR DEBUGING INFORMATIONS diff --git a/packages/ettercap/ettercap-ng_0.7.3.bb b/packages/ettercap/ettercap-ng_0.7.3.bb new file mode 100644 index 0000000000..c9e73d9ea0 --- /dev/null +++ b/packages/ettercap/ettercap-ng_0.7.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "network sniffer/interceptor/logger for ethernet LANs. It \ +supports active and passive dissection of many protocols (even ciphered ones, \ +like SSH and HTTPS)." +SECTION = "console/network" +DEPENDS = "virtual/libiconv libnet libpcap openssl libpcre ncurses zlib libtool" +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \ + file://autotools.patch;patch=1" + +S = "${WORKDIR}/ettercap-NG-${PV}" + +inherit autotools + +EXTRA_OECONF += "--disable-gtk" + +FILES_${PN} += "${datadir} ${libdir}/ettercap/*.so" +FILES_${PN}-dbg += "${libdir}/ettercap/.debug" diff --git a/packages/ettercap/ettercap_0.6.b.bb b/packages/ettercap/ettercap_0.6.b.bb deleted file mode 100644 index d5983d4481..0000000000 --- a/packages/ettercap/ettercap_0.6.b.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "console/network" -DEPENDS = "ncurses openssl" -LICENSE = "GPL" -DESCRIPTION = "Ettercap is a network sniffer/interceptor/logger \ -for ethernet LANs. It supports active and passive dissection of \ -many protocols (even ciphered ones, like SSH and HTTPS)." - -SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--disable-gtk \ - --with-openssl=${STAGING_LIBDIR}/.." diff --git a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty b/packages/ettercap/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty +++ b/packages/ettercap/files/.mtn2git_empty diff --git a/packages/ettercap/files/autotools.patch b/packages/ettercap/files/autotools.patch new file mode 100644 index 0000000000..b6024c48c7 --- /dev/null +++ b/packages/ettercap/files/autotools.patch @@ -0,0 +1,173 @@ +diff -ur ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3-changed/configure.in +--- ettercap-NG-0.7.3/configure.in 2005-01-13 10:24:28.000000000 +0100 ++++ ettercap-NG-0.7.3-changed/configure.in 2007-11-07 11:42:25.000000000 +0100 +@@ -178,6 +178,7 @@ + + AC_PROG_CC + AM_PROG_CC_STDC ++AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_MAKE_SET + AC_PROG_GCC_TRADITIONAL +@@ -236,7 +237,7 @@ + AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h) + AC_CHECK_HEADERS(sys/cdefs.h) + dnl nameser NS_GET32 and so on... +-EC_NS_GET() ++dnl EC_NS_GET() + + dnl ================================================================== + dnl Checks for typedefs, structures, and compiler characteristics. +@@ -379,129 +380,6 @@ + dnl ================== + + +-dnl --------- +-dnl libpcap +-dnl --------- +-ac_ec_libpcap=default +- +-AC_MSG_CHECKING(for libpcap) +-AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR,use libpcap in DIR), +-[ case "$withval" in +- no) +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(["*** ettercap cannot operate without libpcap. ***"]) +- ;; +- *) +- if test -f $withval/pcap.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-L$withval -lwpcap -lpacket" +- else +- PCAPLIB="-L$withval -lpcap" +- fi +- ac_ec_libpcap=$withval +- AC_MSG_RESULT($withval) +- elif test -f $withval/include/pcap.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval/include" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-L$withval/lib -lwpcap -lpacket" +- else +- PCAPLIB="-L$withval/lib -lpcap" +- fi +- ac_ec_libpcap=$withval +- AC_MSG_RESULT($withval) +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([pcap.h not found in $withval]) +- fi +- ;; +- esac ], +-[ if test -f /usr/include/pcap/pcap.h; then +- PCAPINC="-I/usr/include/pcap" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-lwpcap -lpacket" +- else +- PCAPLIB="-lpcap" +- fi +- elif test -f /usr/include/pcap.h; then +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-lwpcap -lpacket" +- else +- PCAPLIB="-lpcap" +- fi +- elif test -f /usr/local/include/pcap.h; then +- PCAPINC="-I/usr/local/include" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-lwpcap -lpacket" +- else +- PCAPLIB="-lpcap" +- fi +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([libpcap not found]) +- fi +- AC_MSG_RESULT(yes) ] +-) +- +-if test "$OS" = "WINDOWS"; then +- EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) +- EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) +- AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.])) +- AC_CHECK_LIB(iphlpapi, main) +-else +- EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) +-fi +- +-dnl --------- +-dnl libnet +-dnl --------- +-ac_ec_libnet=default +- +-AC_MSG_CHECKING(for libnet) +-AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,use libnet in DIR), +-[ case "$withval" in +- no) +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(["*** ettercap cannot operate without libnet. ***"]) +- ;; +- *) +- if test -f $withval/lnet.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LNETINC="-I$withval" +- LNETLIB="-L$withval -lnet" +- ac_ec_libnet=$withval +- AC_MSG_RESULT($withval) +- elif test -f $withval/include/libnet.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LNETINC="-I$withval/include" +- LNETLIB="-L$withval/lib -L$withval/src -lnet" +- ac_ec_libnet=$withval +- AC_MSG_RESULT($withval) +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([libnet.h not found in $withval]) +- fi +- ;; +- esac ], +-[ if test -f /usr/include/libnet.h; then +- AC_MSG_RESULT(yes) +- LNETINC="" +- LNETLIB="-lnet" +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([libnet >= 1.1.2.1 not found]) +- fi +-] +-) +- +-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required])) +- + dnl ------------------ + dnl Checks for openssl + dnl ------------------ +@@ -794,7 +672,8 @@ + dnl set up the final vars + dnl ----------------------- + EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC" +-EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB" ++dnl EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB" ++EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB -lpcap -lnet" + + AC_SUBST(EC_CFLAGS) + AC_SUBST(EC_LIBS) +diff -ur ettercap-NG-0.7.3/src/Makefile.am ettercap-NG-0.7.3-changed/src/Makefile.am +--- ettercap-NG-0.7.3/src/Makefile.am 2005-01-13 10:18:48.000000000 +0100 ++++ ettercap-NG-0.7.3-changed/src/Makefile.am 2007-11-06 20:15:12.000000000 +0100 +@@ -127,8 +127,7 @@ + + ettercap_CFLAGS = @EC_CFLAGS@ + +-ettercap_LDADD = @LIBOBJS@ \ +- os/libec_os.a \ ++ettercap_LDADD = missing/strlcpy.o os/libec_os.a \ + interfaces/daemon/libec_daemon.a \ + interfaces/text/libec_text.a + diff --git a/packages/glibc/glibc-intermediate_2.7.bb b/packages/glibc/glibc-intermediate_2.7.bb new file mode 100644 index 0000000000..05d6250783 --- /dev/null +++ b/packages/glibc/glibc-intermediate_2.7.bb @@ -0,0 +1,8 @@ +require glibc_${PV}.bb +require glibc-intermediate.inc + +# gcc uses -Werror which break on a "you have no thumb interwork" _warning_ +do_configure_prepend() { + sed -i s:-Werror:: ${S}/configure +} + diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb index d0aa30477a..675c556b6f 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre2.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb @@ -9,7 +9,7 @@ SECTION = "x11" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://www.gpsdrive.cc/${PN}-${PV}.tar.gz \ +SRC_URI = "http://www.gpsdrive.de/${PN}-${PV}.tar.gz \ file://gpsdrive.desktop" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/libogg/libtheora_0.9+1.0alpha7.bb b/packages/libogg/libtheora_0.9+1.0alpha7.bb index 4f2cb4ab35..67ec27b560 100644 --- a/packages/libogg/libtheora_0.9+1.0alpha7.bb +++ b/packages/libogg/libtheora_0.9+1.0alpha7.bb @@ -1,5 +1,5 @@ -DEPENDS = "libogg libtheora libsdl-x11" +DEPENDS = "libogg libsdl-x11" SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz" diff --git a/packages/librcf/librcf_0.4.bb b/packages/librcf/librcf_0.4.bb index aad6f7c338..d18d2d8241 100644 --- a/packages/librcf/librcf_0.4.bb +++ b/packages/librcf/librcf_0.4.bb @@ -3,7 +3,6 @@ SECTION = "base" PRIORITY = "optional" LICENSE = "unknown" DEPENDS="zlib openssl boost-asio" -RDEPENDS = "libstdc++5 libgcc1" # the SOURCE_URI requires authentication via web browser and cookie (gasp) # all we can do right now is download the file and save it under sources/ diff --git a/packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch index 034acc7b8e..034acc7b8e 100644 --- a/packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch +++ b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb index 29a96deb88..141e689c41 100644 --- a/packages/linux/linux-rp_2.6.23.bb +++ b/packages/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" @@ -120,7 +120,7 @@ SRC_URI_append_tosa = "\ file://tosa-lcdnoise-r1-fix-r0.patch;patch=1 \ file://arm-dma-coherent.patch;patch=1 \ file://usb-ohci-hooks-r3.patch;patch=1 \ - file://tmio-ohci-r8.patch;patch=1 \ + file://tmio-ohci-r9.patch;patch=1 \ " # ${DOSRC}/tosa-asoc-r1.patch;patch=1 " diff --git a/packages/lm_sensors/lmsensors-apps_2.10.1.bb b/packages/lm_sensors/lmsensors-apps_2.10.1.bb index ce188beb64..91d7371ca1 100644 --- a/packages/lm_sensors/lmsensors-apps_2.10.1.bb +++ b/packages/lm_sensors/lmsensors-apps_2.10.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Hardware health monitoring applications" HOMEPAGE = "http://secure.netroedge.com/~lm78/" -DEPENDS = "libsysfs virtual/libiconv" +DEPENDS = "sysfsutils virtual/libiconv" LICENSE = "GPL" PR = "r2" diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb index fa6e989b16..ca68003b94 100644 --- a/packages/matchbox-common/matchbox-common_0.9.1.bb +++ b/packages/matchbox-common/matchbox-common_0.9.1.bb @@ -2,13 +2,13 @@ DESCRIPTION = "Matchbox window manager common files" SECTION = "x11/wm" LICENSE = "GPL" DEPENDS = "libmatchbox" -PR = "r3" +PR = "r4" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://no-utilities-category.patch;patch=1 \ file://add-media-category.patch;patch=1" -inherit autotools pkgconfig +inherit autotools pkgconfig update-alternatives EXTRA_OECONF = "--enable-pda-folders" @@ -17,4 +17,10 @@ FILES_${PN} = "\ ${datadir}/matchbox/vfolders \ ${datadir}/pixmaps" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager" +ALTERNATIVE_PRIORITY = "11" + + PACKAGE_ARCH = "all" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb index 524dc1af36..58da385674 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb index 524dc1af36..58da385674 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb index a46073b924..a85e4b23c4 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb @@ -1,8 +1,8 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" -PR = "r1" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" +PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb index 2363801cb2..c2016cab66 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb @@ -1,8 +1,8 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" -PR = "r2" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" +PR = "r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb index 5ce26cbab2..80b6dc7e19 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb index f135ffd426..0be38b33cb 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -1,8 +1,8 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" -PR="r1" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb index 8387d957a1..700fb15eeb 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz" S = "${WORKDIR}/matchbox-window-manager-${PV}" diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb index e55f7a5c4e..dad8163232 100644 --- a/packages/matchbox-wm/matchbox-wm_1.0.bb +++ b/packages/matchbox-wm/matchbox-wm_1.0.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" -PR="r2" +PR="r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-${PV}.tar.gz \ diff --git a/packages/matchbox-wm/matchbox-wm_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb index c3e8186481..703470adea 100644 --- a/packages/matchbox-wm/matchbox-wm_1.1.bb +++ b/packages/matchbox-wm/matchbox-wm_1.1.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" -PR="r1" +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb index 83eb403c5f..bf57441815 100644 --- a/packages/matchbox-wm/matchbox-wm_1.2.bb +++ b/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native " +RDEPENDS = "" -PR="r1" +PR="r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ file://gconf-2.m4 \ @@ -23,7 +23,7 @@ FILES_${PN} = "${bindir}/* \ ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager" ALTERNATIVE_PRIORITY = "10" EXTRA_OECONF = " \ diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 91c66dae90..554811d597 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" PV = "1.1+svn${SRCDATE}" -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ diff --git a/packages/navit/navit_0.0.1.bb b/packages/navit/navit_0.0.1.bb index 74ce41b78f..2db71a3e87 100644 --- a/packages/navit/navit_0.0.1.bb +++ b/packages/navit/navit_0.0.1.bb @@ -1,13 +1,12 @@ DESCRIPTION = "Navit is a car navigation system with routing engine." LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+" -PV = "0.0.1" PR = "r2" inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \ - file://compile-fix.patch;patch=1" + file://compile-fix.patch;patch=1" EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float" diff --git a/packages/navit/navit_0.0.2.bb b/packages/navit/navit_0.0.2.bb new file mode 100644 index 0000000000..ce34ee835b --- /dev/null +++ b/packages/navit/navit_0.0.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Navit is a car navigation system with routing engine." +LICENSE = "GPL" +DEPENDS = "glib-2.0 gtk+" +PR = "r0" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \ + file://compile-fix.patch;patch=1" + +EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float" + +FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb new file mode 100644 index 0000000000..8f158d4f79 --- /dev/null +++ b/packages/navit/navit_cvs.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Navit is a car navigation system with routing engine." +LICENSE = "GPL" +DEPENDS = "glib-2.0 gtk+" +PV = "0.0.2+cvs${SRCDATE}" +PR = "r0" + +inherit autotools +S = "${WORKDIR}/navit" + +SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \ + " + +EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" +#--enable-shared + +EXTRA_AUTORECONF = " -I m4" + +FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" + diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index b01d9d3c05..00b2e5e627 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -3,6 +3,7 @@ SECTION = "openmoko/pim" DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" PV = "0.1.0+svnr${SRCREV}" PR = "r5" +PE = "1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb new file mode 100644 index 0000000000..bc1bcaff5e --- /dev/null +++ b/packages/openmoko2/openmoko-messages2_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "The OpenMoko Message application" +SECTION = "openmoko/pim" +DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 + +EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" + +FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 2b18870aec..66ce5da82a 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,8 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -RREPLACES_${PN} = "matchbox-common" -PR = "r40" +PR = "r61" SRC_URI = "\ file://etc \ diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb index 4f72ac9a94..baf60d877b 100644 --- a/packages/openmoko2/openmoko-today2-folders_svn.bb +++ b/packages/openmoko2/openmoko-today2-folders_svn.bb @@ -1,9 +1,8 @@ DESCRIPTION = "The OpenMoko Today2 vfolder files" SECTION = "openmoko/misc" PV = "0.1.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" RCONFLICTS_${PN} = "matchbox-common" -RREPLACES_${PN} = "matchbox-common" inherit openmoko2 diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 76a8504c7d..0584d119c9 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -3,6 +3,7 @@ SECTION = "devel/python" # needs gtk+ 2.10.x DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell python-pycairo python-pygobject" +PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" PR = "ml3" diff --git a/packages/sqlite/sqlite3/.mtn2git_empty b/packages/sqlite/sqlite3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite3/.mtn2git_empty diff --git a/packages/sqlite/sqlite3/cross-compile.patch b/packages/sqlite/sqlite3/cross-compile.patch new file mode 100644 index 0000000000..31d4f0d162 --- /dev/null +++ b/packages/sqlite/sqlite3/cross-compile.patch @@ -0,0 +1,92 @@ +--- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200 ++++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200 +@@ -187,10 +187,11 @@ + default_build_cflags="-g" + if test "$config_BUILD_CC" = ""; then + AC_PROG_CC +- if test "$cross_compiling" = "yes"; then +- AC_MSG_ERROR([unable to find a compiler for building build tools]) +- fi +- BUILD_CC=$CC ++# if test "$cross_compiling" = "yes"; then ++# AC_MSG_ERROR([unable to find a compiler for building build tools]) ++# fi ++# BUILD_CC=$CC ++BUILD_CC=gcc + default_build_cflags=$CFLAGS + else + BUILD_CC=$config_BUILD_CC +@@ -238,6 +239,12 @@ + TARGET_LINK=$config_TARGET_LINK + fi + AC_MSG_RESULT($TARGET_LINK) ++if test "$config_TARGET_LFLAGS" != ""; then ++ TARGET_LFLAGS=$config_TARGET_LFLAGS ++ else ++ TARGET_LFLAGS=$BUILD_LFLAGS ++ fi ++AC_MSG_RESULT($TARGET_LFLAGS) + AC_MSG_CHECKING([switches on the target compiler]) + if test "$config_TARGET_TFLAGS" != ""; then + TARGET_TFLAGS=$config_TARGET_TFLAGS +@@ -592,15 +599,7 @@ + # Figure out what C libraries are required to compile programs + # that use "readline()" library. + # +-if test "$config_TARGET_READLINE_LIBS" != ""; then +- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" +-else +- CC=$TARGET_CC +- LIBS="" +- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) +- AC_CHECK_LIB([readline], [readline]) +- TARGET_READLINE_LIBS="$LIBS" +-fi ++TARGET_READLINE_LIBS="-lreadline" + AC_SUBST(TARGET_READLINE_LIBS) + + ########## +@@ -615,41 +614,8 @@ + ########## + # Figure out where to get the READLINE header files. + # +-AC_MSG_CHECKING([readline header files]) +-found=no +-if test "$config_TARGET_READLINE_INC" != ""; then +- TARGET_READLINE_INC=$config_TARGET_READLINE_INC +- found=yes +-fi +-if test "$found" = "yes"; then +- AC_MSG_RESULT($TARGET_READLINE_INC) +-else +- AC_MSG_RESULT(not specified: still searching...) +- AC_CHECK_HEADER(readline.h, [found=yes]) +-fi +-if test "$found" = "no"; then +- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do +- AC_CHECK_FILE($dir/include/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include" +- break +- fi +- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include/readline" +- break +- fi +- done +-fi +-if test "$found" = "yes"; then +- if test "$TARGET_READLINE_LIBS" = ""; then +- TARGET_HAVE_READLINE=0 +- else +- TARGET_HAVE_READLINE=1 +- fi +-else +- TARGET_HAVE_READLINE=0 +-fi ++TARGET_READLINE_INC="" ++TARGET_HAVE_READLINE=1 + AC_SUBST(TARGET_READLINE_INC) + AC_SUBST(TARGET_HAVE_READLINE) + diff --git a/packages/sqlite/sqlite3/ldflags.patch b/packages/sqlite/sqlite3/ldflags.patch new file mode 100644 index 0000000000..ee5105ffff --- /dev/null +++ b/packages/sqlite/sqlite3/ldflags.patch @@ -0,0 +1,67 @@ +--- sqlite-3.3.7/Makefile.in.orig 2006-08-20 23:05:36.000000000 +0200 ++++ sqlite-3.3.7/Makefile.in 2006-08-20 23:42:49.000000000 +0200 +@@ -31,6 +31,10 @@ + # + TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src + ++# OE overrides ++# ++TARGET_LFLAGS = @TARGET_LFLAGS@ ++ + # Define -DNDEBUG to compile without debugging (i.e., for production usage) + # Omitting the define will cause extra debugging code to be inserted and + # includes extra comments when "EXPLAIN stmt" is used. +@@ -257,17 +261,17 @@ + | $(NAWK) '{print $$5,$$6}' >last_change + + libsqlite3.la: $(LIBOBJ) +- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ ++ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \ + ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ +- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ ++ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \ + -rpath $(libdir)/sqlite \ + -version-info "8:6:8" + + sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h +- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ ++ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \ + -o $@ $(TOP)/src/shell.c libsqlite3.la \ + $(LIBREADLINE) $(TLIBS) + +@@ -456,12 +460,12 @@ + + tclsqlite3: tclsqlite-shell.lo libsqlite3.la + $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) + $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ + $(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + + fulltest: testfixture$(TEXE) sqlite3$(TEXE) +@@ -471,7 +475,7 @@ + ./testfixture $(TOP)/test/quick.test + + sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \ +- $(TESTSRC) $(TOP)/tool/spaceanal.tcl ++ $(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl + sed \ + -e '/^#/d' \ + -e 's,\\,\\\\,g' \ +@@ -481,7 +485,7 @@ + $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h + $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\ + -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libtclsqlite3.la $(LIBTCL) ++ libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + # Rules used to build documentation + # diff --git a/packages/sqlite/sqlite3/libtool.patch b/packages/sqlite/sqlite3/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3/libtool.patch @@ -0,0 +1,25 @@ +Index: sqlite-3.2.1/Makefile.in +=================================================================== +--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 ++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 +@@ -15,7 +15,10 @@ + # The toplevel directory of the source tree. This is the directory + # that contains this "Makefile.in" and the "configure.in" script. + # +-TOP = @srcdir@ ++TOP = $(srcdir) ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = . + + # C Compiler and options for use in building executables that + # will run on the platform that is doing the build. +@@ -96,7 +99,7 @@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ + INSTALL = @INSTALL@ +-LIBTOOL = ./libtool ++LIBTOOL = @LIBTOOL@ + ALLOWRELEASE = @ALLOWRELEASE@ + + # libtool compile/link/install diff --git a/packages/sqlite/sqlite3_3.5.2.bb b/packages/sqlite/sqlite3_3.5.2.bb new file mode 100644 index 0000000000..53fd96c705 --- /dev/null +++ b/packages/sqlite/sqlite3_3.5.2.bb @@ -0,0 +1 @@ +require sqlite3.inc diff --git a/packages/tasks/task-gpe-sectest.bb b/packages/tasks/task-gpe-sectest.bb deleted file mode 100644 index b647c6136b..0000000000 --- a/packages/tasks/task-gpe-sectest.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Security testing task packages for GPE Palmtop Environment" -PR = "r6" -LICENSE = "MIT" - -inherit task - -RDEPENDS_${PN} = "\ - nmap \ - ettercap \ - stunnel \ - curl \ - dsniff \ - prismstumbler \ - tcpdump \ - kismet \ - hydra \ - thcrut" - diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index ba5bd20a03..f03e822db8 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r68" +PR = "r69" inherit task @@ -58,7 +58,6 @@ RDEPENDS_task-openmoko-ui = "\ xserver-kdrive-fbdev \ xserver-kdrive-common \ xserver-nodm-init \ - ttf-bitstream-vera \ xauth \ xhost \ xset \ diff --git a/packages/wifi-radar/wifi-radar_1.9.6.bb b/packages/wifi-radar/wifi-radar_1.9.6.bb index 59d24b9d74..57eb9e33fb 100644 --- a/packages/wifi-radar/wifi-radar_1.9.6.bb +++ b/packages/wifi-radar/wifi-radar_1.9.6.bb @@ -3,11 +3,11 @@ DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles." HOMEPAGE="http://www.bitbuilder.com/wifi_radar/" LICENSE = "GPL" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "all" -RDEPENDS = "python-core python-pygtk2 python-re python-io python-pygobject python-pycairo" +RDEPENDS = "python-core python-pygtk python-re python-io python-pygobject python-pycairo" SRC_URI="http://wifi-radar.systemimager.org/pub/${PN}-${PV}.tar.bz2 \ file://wifi-radar.patch;patch=1 \ diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch b/packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch new file mode 100644 index 0000000000..5027c0066f --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch @@ -0,0 +1,221 @@ +Index: linux-wlan-ng-0.2.7/src/prism2/driver/prism2sta.c +=================================================================== +--- linux-wlan-ng-0.2.7.orig/src/prism2/driver/prism2sta.c 2007-11-13 15:09:52.686428934 +0300 ++++ linux-wlan-ng-0.2.7/src/prism2/driver/prism2sta.c 2007-11-13 16:44:19.386567678 +0300 +@@ -1438,9 +1438,15 @@ + return; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++void prism2sta_processing_defer(struct work_struct *work) ++{ ++ hfa384x_t *hw = container_of(work, hfa384x_t, link_bh); ++#else + void prism2sta_processing_defer(void *data) + { + hfa384x_t *hw = (hfa384x_t *) data; ++#endif + wlandevice_t *wlandev = hw->wlandev; + hfa384x_bytestr32_t ssid; + int result; +@@ -1540,7 +1546,11 @@ + WLAN_MACMODE_IBSS_STA : WLAN_MACMODE_ESS_STA; + + /* Get the ball rolling on the comms quality stuff */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++ prism2sta_commsqual_defer(&hw->commsqual_bh); ++#else + prism2sta_commsqual_defer(hw); ++#endif + } + break; + +@@ -2413,9 +2423,15 @@ + } + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++void prism2sta_commsqual_defer(struct work_struct *work) ++{ ++ hfa384x_t *hw = container_of(work, hfa384x_t, usb_work); ++#else + void prism2sta_commsqual_defer(void *data) + { + hfa384x_t *hw = (hfa384x_t *) data; ++#endif + wlandevice_t *wlandev = hw->wlandev; + hfa384x_bytestr32_t ssid; + int result = 0; +Index: linux-wlan-ng-0.2.7/src/p80211/p80211conv.c +=================================================================== +--- linux-wlan-ng-0.2.7.orig/src/p80211/p80211conv.c 2007-11-13 14:33:27.646440199 +0300 ++++ linux-wlan-ng-0.2.7/src/p80211/p80211conv.c 2007-11-13 14:56:45.678436613 +0300 +@@ -497,7 +497,11 @@ + } + + skb->protocol = eth_type_trans(skb, netdev); ++#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) ) + skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ ++#else ++ skb->mac_header = (unsigned char *) e_hdr; ++#endif + + /* jkriegl: process signal and noise as set in hfa384x_int_rx() */ + /* jkriegl: only process signal/noise if requested by iwspy */ +Index: linux-wlan-ng-0.2.7/src/p80211/p80211netdev.c +=================================================================== +--- linux-wlan-ng-0.2.7.orig/src/p80211/p80211netdev.c 2007-11-13 14:56:08.098439975 +0300 ++++ linux-wlan-ng-0.2.7/src/p80211/p80211netdev.c 2007-11-13 14:57:22.326437672 +0300 +@@ -389,7 +389,11 @@ + + /* set up various data fields */ + skb->dev = dev; ++#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) ) + skb->mac.raw = skb->data ; ++#else ++ skb_reset_mac_header(skb); ++#endif + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); +Index: linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x_usb.c +=================================================================== +--- linux-wlan-ng-0.2.7.orig/src/prism2/driver/hfa384x_usb.c 2007-11-13 14:58:29.000000000 +0300 ++++ linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x_usb.c 2007-11-13 16:41:35.914446535 +0300 +@@ -128,6 +128,9 @@ + #include <linux/netdevice.h> + #include <linux/timer.h> + #include <asm/io.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) ++#include <linux/workqueue.h> ++#endif + #include <linux/delay.h> + #include <asm/byteorder.h> + #include <asm/bitops.h> +@@ -246,8 +249,13 @@ + wlandevice_t *wlandev, + hfa384x_usb_rxfrm_t *rxfrm); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++static void ++hfa384x_usb_defer(struct work_struct *work); ++#else + static void + hfa384x_usb_defer(void *hw); ++#endif + + static int + submit_rx_urb(hfa384x_t *hw, int flags); +@@ -257,7 +265,7 @@ + + /*---------------------------------------------------*/ + /* Callbacks */ +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) ++#if ( (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) ) + static void + hfa384x_usbout_callback(struct urb *urb); + static void +@@ -578,10 +586,17 @@ + * Call context: + * process (by design) + ----------------------------------------------------------------*/ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) + static void +-hfa384x_usb_defer(void *data) ++hfa384x_usb_defer(struct work_struct *work) ++{ ++ hfa384x_t *hw = container_of(work, hfa384x_t, usb_work); ++#else ++static void ++hfa384x_usb_defer(void *hw) + { + hfa384x_t *hw = data; ++#endif + struct net_device *netdev = hw->wlandev->netdev; + + DBFENTER; +@@ -711,8 +726,13 @@ + tasklet_init(&hw->completion_bh, + hfa384x_usbctlx_completion_task, + (unsigned long)hw); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++ INIT_WORK(&hw->link_bh, prism2sta_processing_defer); ++ INIT_WORK(&hw->usb_work, hfa384x_usb_defer); ++#else + INIT_WORK(&hw->link_bh, prism2sta_processing_defer, hw); + INIT_WORK(&hw->usb_work, hfa384x_usb_defer, hw); ++#endif + + init_timer(&hw->throttle); + hw->throttle.function = hfa384x_usb_throttlefn; +@@ -733,7 +753,11 @@ + hw->link_status = HFA384x_LINK_NOTCONNECTED; + hw->state = HFA384x_STATE_INIT; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) ++ INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer); ++#else + INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer, hw); ++#endif + init_timer(&hw->commsqual_timer); + hw->commsqual_timer.data = (unsigned long) hw; + hw->commsqual_timer.function = prism2sta_commsqual_timer; +@@ -3847,7 +3871,7 @@ + * Call context: + * interrupt + ----------------------------------------------------------------*/ +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) ++#if ( (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) ) + void hfa384x_usbin_callback(struct urb *urb) + #else + void hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs) +@@ -4253,7 +4277,11 @@ + /* The prism2 series does not return the CRC */ + memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); + ++#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) ) + skb->mac.raw = skb->data; ++#else ++ skb_reset_mac_header(skb); ++#endif + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); +@@ -4506,7 +4534,7 @@ + * Call context: + * interrupt + ----------------------------------------------------------------*/ +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) ++#if ( (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) ) + void hfa384x_usbout_callback(struct urb *urb) + #else + void hfa384x_usbout_callback(struct urb *urb, struct pt_regs *regs) +@@ -4587,7 +4615,7 @@ + * Call context: + * interrupt + ----------------------------------------------------------------*/ +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) ++#if ( (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) ) + void hfa384x_ctlxout_callback(struct urb *urb) + #else + void hfa384x_ctlxout_callback(struct urb *urb, struct pt_regs *regs) +Index: linux-wlan-ng-0.2.7/src/prism2/include/prism2/prism2mgmt.h +=================================================================== +--- linux-wlan-ng-0.2.7.orig/src/prism2/include/prism2/prism2mgmt.h 2007-11-13 15:08:28.000000000 +0300 ++++ linux-wlan-ng-0.2.7/src/prism2/include/prism2/prism2mgmt.h 2007-11-13 15:09:37.469456438 +0300 +@@ -168,9 +168,14 @@ + UINT8 *prism2buf, p80211pstrd_t *pstr, hfa384x_t *priv ); + int prism2mgmt_get_grpaddr_index( UINT32 did ); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++void prism2sta_processing_defer(struct work_struct *work); ++void prism2sta_commsqual_defer(struct work_struct *work); ++#else + void prism2sta_processing_defer(void *data); +- + void prism2sta_commsqual_defer(void *data); ++#endif ++ + void prism2sta_commsqual_timer(unsigned long data); + + /*=============================================================*/ diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in new file mode 100644 index 0000000000..a2bc086629 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in @@ -0,0 +1,21 @@ +WLAN_VERSION=0 +WLAN_PATCHLEVEL=2 +WLAN_SUBLEVEL=8 +WLAN_EXTRAVERSION=svn20071030 +#LINUX_SRC=$(KERNEL_SOURCE) +PCMCIA_SRC= +PREFIX= +INST_EXEDIR=/sbin +#TARGET_ROOT_ON_HOST= +#RC_DIR=/etc/init.d +PCMCIA_DIR=/etc/pcmcia +SYSV_INIT=y +INSTALL_DEPMOD= +WLAN_DEBUG=n +CROSS_COMPILE_ENABLED=n +CROSS_COMPILE= +HOST_COMPILE= +PRISM2_PLX=n +PRISM2_PCMCIA=n +PRISM2_PCI=n +PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch new file mode 100644 index 0000000000..abb3b137da --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared p80211 prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=driver ridlist + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb index 169b72dd0b..cb8d96e204 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb @@ -1,6 +1,7 @@ require wlan-ng-modules.inc -SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2" +SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ + file://2.6.22-fixes.patch;patch=1" S = "${WORKDIR}/linux-wlan-ng-${PV}" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb new file mode 100644 index 0000000000..8e885b5ad2 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb @@ -0,0 +1,9 @@ +require wlan-ng-modules.inc + +SRCDATE = "20071030" +PV = "0.2.8+svn${SRCDATE}" + +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " + +S = "${WORKDIR}/trunk" + diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in new file mode 100644 index 0000000000..298935770d --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in @@ -0,0 +1,21 @@ +WLAN_VERSION=0 +WLAN_PATCHLEVEL=2 +WLAN_SUBLEVEL=8 +WLAN_EXTRAVERSION= +#LINUX_SRC=$(KERNEL_SOURCE) +PCMCIA_SRC=. +PREFIX= +INST_EXEDIR=/sbin +#TARGET_ROOT_ON_HOST= +#RC_DIR=/etc/init.d +PCMCIA_DIR=/etc/pcmcia +SYSV_INIT=y +INSTALL_DEPMOD= +WLAN_DEBUG=n +CROSS_COMPILE_ENABLED=n +CROSS_COMPILE= +HOST_COMPILE= +PRISM2_PLX=y +PRISM2_PCMCIA=y +PRISM2_PCI=y +PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch new file mode 100644 index 0000000000..af1f442a4c --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=ridlist download + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb new file mode 100644 index 0000000000..e37d548a9f --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb @@ -0,0 +1,7 @@ +require wlan-ng-utils.inc + +SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ + file://pcmciasrc.patch;patch=1 \ + file://hostldflags.patch;patch=1" + +PR = "r0" diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb index 7d9dc18c84..6e5d7fe5ba 100644 --- a/packages/xorg-data/xbitmaps_1.0.1.bb +++ b/packages/xorg-data/xbitmaps_1.0.1.bb @@ -2,5 +2,5 @@ require xorg-data-common.inc DESCRIPTION = "Common X11 Bitmaps" LICENSE = "MIT" -DEPENDS += "libxmu xbitmaps" +DEPENDS += "libxmu" |