diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-08-04 17:26:04 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-04 17:26:04 +0000 |
| commit | 194e9823419ad76b29d14edb3733c18009fe3311 (patch) | |
| tree | f5cfd383da8db66b1ac1e0740fd17d81c632e328 | |
| parent | 5b511e5e7d437f2b897511c7d70232f1e60b5510 (diff) | |
| parent | 319f88ac01cb5cb3ec90a088705e16c30c686d06 (diff) | |
merge of 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df
and c579a3af7687e512137c2653f94a4b14ce3b4d4f
105 files changed, 3556 insertions, 722 deletions
diff --git a/classes/gpe.bbclass b/classes/gpe.bbclass index 88c2314fe7..8cd9e4fc5d 100644 --- a/classes/gpe.bbclass +++ b/classes/gpe.bbclass @@ -1,6 +1,6 @@ DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " -GPE_SRC_COMPRESSION ?= "gz" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_SRC_COMPRESSION}" +GPE_TARBALL_SUFFIX ?= "gz" +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry" inherit gettext diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass new file mode 100644 index 0000000000..ee022c99d2 --- /dev/null +++ b/classes/sourcepkg.bbclass @@ -0,0 +1,111 @@ +DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source" +EXCLUDE_FROM ?= ".pc" + +# used as part of a path. make sure it's set +DISTRO ?= "openembedded" + +def get_src_tree(d): + import bb + import os, os.path + + workdir = bb.data.getVar('WORKDIR', d, 1) + if not workdir: + bb.error("WORKDIR not defined, unable to find source tree.") + return + + s = bb.data.getVar('S', d, 0) + if not s: + bb.error("S not defined, unable to find source tree.") + return + + s_tree_raw = s.split('/')[1] + s_tree = bb.data.expand(s_tree_raw, d) + + src_tree_path = os.path.join(workdir, s_tree) + try: + os.listdir(src_tree_path) + except OSError: + bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path) + bb.debug("Assuming source tree is '%s'" % src_tree_path) + + return s_tree + +sourcepkg_do_create_orig_tgz(){ + + mkdir -p ${DEPLOY_DIR_SRC} + cd ${WORKDIR} + for i in ${EXCLUDE_FROM}; do + echo $i >> temp/exclude-from-file + done + + src_tree=${@get_src_tree(d)} + + echo $src_tree + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" + tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz $src_tree --exclude-from temp/exclude-from-file + cp -a $src_tree $src_tree.orig +} + +sourcepkg_do_archive_bb() { + + src_tree=${@get_src_tree(d)} + dest=${WORKDIR}/$src_tree/${DISTRO} + mkdir -p $dest + + cp ${FILE} $dest +} + +python sourcepkg_do_dumpdata() { + import os + import os.path + + workdir = bb.data.getVar('WORKDIR', d, 1) + distro = bb.data.getVar('DISTRO', d, 1) + s_tree = get_src_tree(d) + openembeddeddir = os.path.join(workdir, s_tree, distro) + dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}.showdata.dump",d)) + + try: + os.mkdir(openembeddeddir) + except OSError: + # dir exists + pass + + bb.note("Dumping metadata into '%s'" % dumpfile) + f = open(dumpfile, "w") + # emit variables and shell functions + bb.data.emit_env(f, d, True) + # emit the metadata which isnt valid shell + for e in d.keys(): + if bb.data.getVarFlag(e, 'python', d): + f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1))) + f.close() +} + +sourcepkg_do_create_diff_gz(){ + + cd ${WORKDIR} + for i in ${EXCLUDE_FROM}; do + echo $i >> temp/exclude-from-file + done + + + src_tree=${@get_src_tree(d)} + + for i in `find . -maxdepth 1 -type f`; do + mkdir -p $src_tree/${DISTRO}/files + cp $i $src_tree/${DISTRO}/files + done + + oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz" + LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz + rm -rf $src_tree.orig +} + +EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz + +addtask create_orig_tgz after do_unpack before do_patch +addtask archive_bb after do_patch before do_dumpdata +addtask dumpdata after archive_bb before do_create_diff_gz +addtask create_diff_gz after do_dump_data before do_configure + diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 168b7dec4e..290166bb03 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -42,16 +42,9 @@ def tinder_send_http(da, header, log): import httplib, urllib cont = "\n%s\n%s" % ( header, log) headers = {"Content-type": "multipart/form-data" } - print cont conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True)) conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers) - - resp = conn.getresponse() - print resp.status, resp.reason - data = resp.read() - print data - conn.close() diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index 10098da8ea..793348597f 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -4,13 +4,10 @@ # Global class to make it easier to maintain XFCE packages -HOMEPAGE="http://www.xfce.org" -LICENSE="LGPL-2" +HOMEPAGE = "http://www.xfce.org" +LICENSE = "LGPL-2" -SRC_URI="http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz" - -# Most, but not *all* packages use pkgconfig, so we can't include it here -# too +SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz" inherit autotools @@ -18,9 +15,5 @@ EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/" # FIXME: Put icons in their own package too? -PACKAGES += "${PN}-mcs-plugins ${PN}-plugins" - FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" -FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" -FILES_${PN}-doc += " ${datadir}/xfce4/doc" -FILES_${PN}-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so" +FILES_${PN}-doc += "${datadir}/xfce4/doc" diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf new file mode 100644 index 0000000000..3ab2c056ae --- /dev/null +++ b/conf/distro/openslug-native-packages.conf @@ -0,0 +1,10 @@ +# automatically generated by bitbake freeze +BBFILES := "\ +${PKGDIR}/packages/gzip/*.bb \ +${PKGDIR}/packages/ipkg-utils/*.bb \ +${PKGDIR}/packages/meta/package-index.bb \ +${PKGDIR}/packages/meta/openslug-native-packages.bb \ +${PKGDIR}/packages/freeze/*.bb \ +${PKGDIR}/packages/vlan/*.bb \ +${OPENSLUG_EXTRA_BBFILES}" +# I don't know of any packages we currently need to compile nativly, so this is something to test with diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index f946afe216..708bbf1360 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -2,16 +2,19 @@ include conf/distro/openslug.conf # Corresponting packages should be in openslug-native.bb, # currently missing: ipkg-utils libtool quilt pkgconfig -ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native \ - quilt-native ipkg-utils-native gnu-config-native pkgconfig-native \ - virtual/armeb-linux-gcc virtual/libc update-rc.d" +ASSUME_PROVIDED = "libtool-cross \ + libtool-native \ + automake-native \ + autoconf-native \ + quilt-native \ + ipkg-native \ + gnu-config-native \ + pkgconfig-native \ + virtual/armeb-linux-gcc \ + virtual/libc \ + update-rc.d \ + " # Our build host is armeb, not armv5eb that the kernel reports BUILD_ARCH = armeb -# I don't know of any packages we currently need to compile nativly, so here are two examples -BBFILES = "\ -${PKGDIR}/packages/vlan/*.bb \ -${PKGDIR}/packages/gzip/*.bb \ -${OPENSLUG_EXTRA_BBFILES}" - diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 8719894e6a..e576d83329 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -1,4 +1,3 @@ -# automatically generated by bitbake freeze BBFILES := "\ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ @@ -47,12 +46,12 @@ ${PKGDIR}/packages/glibc/*.bb \ ${PKGDIR}/packages/gnu-config/*.bb \ ${PKGDIR}/packages/gphoto2/*.bb \ ${PKGDIR}/packages/grep/*.bb \ -${PKGDIR}/packages/groff/*.bb \ ${PKGDIR}/packages/gtk-doc/*.bb \ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/hotplug-ng/*.bb \ ${PKGDIR}/packages/initscripts/*.bb \ ${PKGDIR}/packages/install/*.bb \ +${PKGDIR}/packages/iperf/*.bb \ ${PKGDIR}/packages/ipkg-utils/*.bb \ ${PKGDIR}/packages/ipkg/*.bb \ ${PKGDIR}/packages/ircp/*.bb \ @@ -69,6 +68,8 @@ ${PKGDIR}/packages/libmad/*.bb \ ${PKGDIR}/packages/libmikmod/*.bb \ ${PKGDIR}/packages/libogg/*.bb \ ${PKGDIR}/packages/libpcap/*.bb \ +${PKGDIR}/packages/libpng/*.bb \ +${PKGDIR}/packages/libtiff/*.bb \ ${PKGDIR}/packages/libtool/*.bb \ ${PKGDIR}/packages/libusb/*.bb \ ${PKGDIR}/packages/libvorbis/*.bb \ @@ -100,6 +101,7 @@ ${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netpbm/*.bb \ ${PKGDIR}/packages/nfs-utils/*.bb \ ${PKGDIR}/packages/nis/*.bb \ ${PKGDIR}/packages/nslu2-binary-only/*.bb \ @@ -151,7 +153,6 @@ ${PKGDIR}/packages/tar/*.bb \ ${PKGDIR}/packages/thttpd/*.bb \ ${PKGDIR}/packages/timezones/*.bb \ ${PKGDIR}/packages/tinylogin/*.bb \ -${PKGDIR}/packages/udev/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ @@ -159,6 +160,7 @@ ${PKGDIR}/packages/update-rc.d/*.bb \ ${PKGDIR}/packages/upslug/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/wakelan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/xinetd/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index c6575241ba..05498dc1c1 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -1,7 +1,7 @@ # automatically generated by bitbake freeze -# hacked by the addition of UCSLUG_EXTRA_BBFILES at the end BBFILES := "\ ${PKGDIR}/packages/atftp/*.bb \ +${PKGDIR}/packages/audiofile/*.bb \ ${PKGDIR}/packages/autoconf/*.bb \ ${PKGDIR}/packages/automake/*.bb \ ${PKGDIR}/packages/base-files/*.bb \ @@ -31,6 +31,7 @@ ${PKGDIR}/packages/dropbear/*.bb \ ${PKGDIR}/packages/expat/*.bb \ ${PKGDIR}/packages/fakeroot/*.bb \ ${PKGDIR}/packages/findutils/*.bb \ +${PKGDIR}/packages/flac/*.bb \ ${PKGDIR}/packages/flex/*.bb \ ${PKGDIR}/packages/freeze/*.bb \ ${PKGDIR}/packages/ftpd-topfield/*.bb \ @@ -56,12 +57,17 @@ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ +${PKGDIR}/packages/libao/*.bb \ ${PKGDIR}/packages/libexif/*.bb \ ${PKGDIR}/packages/libgphoto2/*.bb \ ${PKGDIR}/packages/libiconv/*.bb \ ${PKGDIR}/packages/libid3tag/*.bb \ +${PKGDIR}/packages/libmad/*.bb \ +${PKGDIR}/packages/libmikmod/*.bb \ ${PKGDIR}/packages/libogg/*.bb \ ${PKGDIR}/packages/libpcap/*.bb \ +${PKGDIR}/packages/libpng/*.bb \ +${PKGDIR}/packages/libtiff/*.bb \ ${PKGDIR}/packages/libtool/*.bb \ ${PKGDIR}/packages/libusb/*.bb \ ${PKGDIR}/packages/libvorbis/*.bb \ @@ -73,8 +79,6 @@ ${PKGDIR}/packages/lzo/*.bb \ ${PKGDIR}/packages/m4/*.bb \ ${PKGDIR}/packages/make/*.bb \ ${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/man-pages/*.bb \ -${PKGDIR}/packages/man/*.bb \ ${PKGDIR}/packages/meta/*.bb \ ${PKGDIR}/packages/miau/*.bb \ ${PKGDIR}/packages/microcom/*.bb \ @@ -83,6 +87,7 @@ ${PKGDIR}/packages/modutils/*.bb \ ${PKGDIR}/packages/monotone/*.bb \ ${PKGDIR}/packages/mt-daapd/*.bb \ ${PKGDIR}/packages/mtd/*.bb \ +${PKGDIR}/packages/musicpd/*.bb \ ${PKGDIR}/packages/mutt/*.bb \ ${PKGDIR}/packages/mysql/*.bb \ ${PKGDIR}/packages/nail/*.bb \ @@ -90,6 +95,7 @@ ${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netpbm/*.bb \ ${PKGDIR}/packages/nslu2-binary-only/*.bb \ ${PKGDIR}/packages/ntp/*.bb \ ${PKGDIR}/packages/obexftp/*.bb \ @@ -106,12 +112,12 @@ ${PKGDIR}/packages/patcher/*.bb \ ${PKGDIR}/packages/pciutils/*.bb \ ${PKGDIR}/packages/pcmcia-cs/*.bb \ ${PKGDIR}/packages/pcre/*.bb \ +${PKGDIR}/packages/perl/*.bb \ ${PKGDIR}/packages/pkgconfig/*.bb \ ${PKGDIR}/packages/popt/*.bb \ ${PKGDIR}/packages/portmap/*.bb \ ${PKGDIR}/packages/ppp/*.bb \ ${PKGDIR}/packages/procps/*.bb \ -${PKGDIR}/packages/psmisc/*.bb \ ${PKGDIR}/packages/puppy/*.bb \ ${PKGDIR}/packages/pwc/*.bb \ ${PKGDIR}/packages/python/*.bb \ @@ -122,11 +128,11 @@ ${PKGDIR}/packages/reiserfsprogs/*.bb \ ${PKGDIR}/packages/rsync/*.bb \ ${PKGDIR}/packages/samba/*.bb \ ${PKGDIR}/packages/sane-backends/*.bb \ -${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/strace/*.bb \ +${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ ${PKGDIR}/packages/sysfsutils/*.bb \ ${PKGDIR}/packages/sysvinit/*.bb \ @@ -140,6 +146,7 @@ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/update-rc.d/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/wakelan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ -${OPENSLUG_UCSLUGC_BBFILES}" +${UCSLUGC_EXTRA_BBFILES}" diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 34bc39a3a3..c321f18009 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -24,7 +24,7 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:openslug:${TARGET_OS}:${TARGET_ARCH}:bui # NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this # directory -OPENSLUG_UCSLUGC_BBFILES ?= "" +UCSLUGC_EXTRA_BBFILES ?= "" # pull in the frozen list of bbfiles - this sets BBFILES and this will override any # setting in local.conf diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index c928093855..8b657281c7 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -11,8 +11,8 @@ XSERVER = "xserver-kdrive-omap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser" -GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser" +GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib" +GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-arm926ejs.conf @@ -56,5 +56,3 @@ pcmcia-cs apm ppp wireless-tools console-tools" include conf/machine/handheld-common.conf - - diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 3beac45143..83849396b2 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -27,6 +27,10 @@ PACKAGE_ARCH = "armeb" # values are.) FULL_OPTIMIZATION = "-fomit-frame-pointer -frename-registers -fweb -funit-at-a-time -Os" +# uClibc does not include sinf or cosf, so the gcc auto-use of +# these functions must be disabled (this only occurs with -O) +FULL_OPTIMIZATION_append_linux-uclibc = " -fno-builtin-sin -fno-builtin-cos" + SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf index 563586c902..4e62a749dc 100644 --- a/conf/machine/tune-arm926ejs.conf +++ b/conf/machine/tune-arm926ejs.conf @@ -1,2 +1,2 @@ -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" PACKAGE_ARCH = "armv5te" diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index f6d03fe69f..988265d72c 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r29" +PR = "r30" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ @@ -54,6 +54,7 @@ INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd" INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN} = "syslog" +CONFFILES_${PN} = "${sysconfdir}/syslog.conf" # This disables the syslog startup links in openslug (see openslug-init) INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." diff --git a/packages/busybox/files/syslog.conf b/packages/busybox/files/syslog.conf index e2a2d58412..d4a0e02f5b 100644 --- a/packages/busybox/files/syslog.conf +++ b/packages/busybox/files/syslog.conf @@ -3,7 +3,7 @@ MARKINT=20 # intervall between --mark-- entries LOGFILE=/var/log/messages # where to log (file) REMOTE=loghost:514 # where to log (syslog remote) REDUCE=no # reduce-size logging -ROTATESIZE=0 # rotate log if grown beyond X [kByte] -ROTATEGENS=3 # keep X generations of rotated logs +#ROTATESIZE=0 # rotate log if grown beyond X [kByte] (incompatible with busybox) +#ROTATEGENS=3 # keep X generations of rotated logs (incompatible with busybox) BUFFERSIZE=64 # size of circular buffer [kByte] FOREGROUND=no # run in foreground (don't use!) diff --git a/packages/libsdl/libsdl-x11-1.2.7/.mtn2git_empty b/packages/crimsonfields/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libsdl/libsdl-x11-1.2.7/.mtn2git_empty +++ b/packages/crimsonfields/.mtn2git_empty diff --git a/packages/crimsonfields/crimsonfields-native_0.4.8.bb b/packages/crimsonfields/crimsonfields-native_0.4.8.bb new file mode 100644 index 0000000000..212590b754 --- /dev/null +++ b/packages/crimsonfields/crimsonfields-native_0.4.8.bb @@ -0,0 +1,26 @@ +include crimsonfields_${PV}.bb +inherit native + +DEPENDS = "libsdl-native libsdl-ttf-native" +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native" + +do_configure() { + gnu-configize + oe_runconf +} + +do_compile() { + cd tools && oe_runmake +} + +do_stage() { + for binary in ${HOST_TOOLS} + do + install -m 0755 tools/$binary ${STAGING_BINDIR} + done + install -m 0644 tools/default.* ${STAGING_DATADIR} +} + +do_install() { + : +} diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb new file mode 100644 index 0000000000..1a6f52b8f4 --- /dev/null +++ b/packages/crimsonfields/crimsonfields_0.4.8.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Crimson Fields is a tactical war game in the tradition of Battle Isle." +SECTION = "games" +DEPENDS = "crimsonfields-native virtual/libsdl libsdl-mixer libsdl-ttf" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2 \ + file://native-tools.patch;patch=1" +S = "${WORKDIR}/crimson-${PV}" + +inherit autotools + +HOST_TOOLS = "cfed mkdatafile mklocale mktileset mkunitset" + +do_configure() { + gnu-configize + oe_runconf + for binary in ${HOST_TOOLS} + do + install -m 0755 ${STAGING_DIR}/${BUILD_SYS}/bin/$binary tools/ + done + install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/default.* tools/ +} + +do_install() { + autotools_do_install + install -d ${D}${palmtopdir}/apps/Games/ + install -d ${D}${palmtopdir}/pics/ + install -m 0644 ${D}${datadir}/applications/crimson.desktop ${D}${palmtopdir}/apps/Games/ + install -m 0644 ${D}${datadir}/pixmaps/*.png ${D}${palmtopdir}/pics/ +} + +FILES_${PN} = "${bindir} ${datadir} ${palmtopdir}" diff --git a/packages/nonworking/crimsonfields/.mtn2git_empty b/packages/crimsonfields/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/crimsonfields/.mtn2git_empty +++ b/packages/crimsonfields/files/.mtn2git_empty diff --git a/packages/crimsonfields/files/native-tools.patch b/packages/crimsonfields/files/native-tools.patch new file mode 100644 index 0000000000..aa5ecc4be0 --- /dev/null +++ b/packages/crimsonfields/files/native-tools.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- crimson-0.4.8/Makefile.in~native-tools ++++ crimson-0.4.8/Makefile.in +@@ -170,7 +170,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + EXTRA_DIST = crimson.desktop crimson.spec.in README.bi2cf README.CoMET +-SUBDIRS = doc src tools gfx levels locale music sfx ++SUBDIRS = doc src gfx levels locale music sfx + DISTCHECK_CONFIGURE_FLAGS = --enable-bi2cf --enable-cf2bmp --enable-cfed --enable-comet + desktopdir = $(datadir)/applications + desktop_DATA = crimson.desktop diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb index cb4d4f18f2..36bfe5d89d 100644 --- a/packages/cron/cron_3.0pl1.bb +++ b/packages/cron/cron_3.0pl1.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "Vixie cron." LICENSE = "cron" -PR="r6" +PR="r7" DEPENDS += "install-native" SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \ @@ -12,7 +12,7 @@ S = "${WORKDIR}/cron${PV}" INITSCRIPT_NAME = "cron" INITSCRIPT_PARAMS = "defaults" - +inherit update-rc.d CFLAGS_append = " -I${S} -DSYS_TIME_H=0" do_install () { diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index 3a2b54072f..80373e3a1b 100644 --- a/packages/dropbear/dropbear_0.46.bb +++ b/packages/dropbear/dropbear_0.46.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" SECTION = "console/network" LICENSE = "MIT" DEPENDS = "zlib" -PR = "r1" +PR = "r3" PROVIDES = "ssh sshd" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ @@ -41,10 +41,8 @@ do_install() { ${D}${localstatedir} install -m 0755 dropbearmulti ${D}${sbindir}/ - for i in ${BINCOMMANDS} - do - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i - done + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + for i in ${SBINCOMMANDS} do ln -s ./dropbearmulti ${D}${sbindir}/$i @@ -57,6 +55,11 @@ do_install() { chmod 755 ${D}${sysconfdir}/init.d/dropbear } +pkg_postinst () { + update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 + update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 +} + pkg_postrm_append () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_rsa_host_key @@ -64,4 +67,6 @@ pkg_postrm_append () { if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_dss_host_key fi + update-alternatives --remove ssh ${bindir}/dropbearmulti + update-alternatives --remove scp ${bindir}/dropbearmulti } diff --git a/packages/espgs/espgs-native_7.07.1rc1.bb b/packages/espgs/espgs-native_7.07.1rc1.bb deleted file mode 100644 index 04581f6bab..0000000000 --- a/packages/espgs/espgs-native_7.07.1rc1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "unknown" -include espgs_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/espgs-${PV}" -DEPENDS = "jpeg-native zlib-native libpng-native" - -PARALLEL_MAKE="" - -do_stage_append () { - install -m 0755 obj/echogs obj/genarch obj/genconf ${STAGING_BINDIR}/ -} diff --git a/packages/espgs/espgs_7.07.1rc1.bb b/packages/espgs/espgs_7.07.1.bb index 9d7d9c2fd1..b6f422fb03 100644 --- a/packages/espgs/espgs_7.07.1rc1.bb +++ b/packages/espgs/espgs_7.07.1.bb @@ -1,11 +1,14 @@ -SECTION = "unknown" -DEPENDS = "jpeg zlib libpng espgs-native" +DESCRIPTION = "ESP Ghostscript is an up-to-date GNU Ghostscript distribution \ +including bug fixes, new drivers, and additional support for CUPS." +HOMEPAGE = "http://espgs.sf.net" +SECTION = "libs" +DEPENDS = "jpeg zlib libpng" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/espgs/espgs-${PV}-source.tar.bz2" S = "${WORKDIR}/espgs-${PV}" -PARALLEL_MAKE="" +PARALLEL_MAKE = "" inherit autotools @@ -15,10 +18,10 @@ EXTRA_OECONF = "--with-drivers= \ --without-omni \ --without-x \ --disable-cups" -EXTRA_OEMAKE = "'BUILD_TIME_GS=${STAGING_BINDIR}/gs' \ - 'ECHOGS_XE=${STAGING_BINDIR}/echogs' \ - 'GENARCH_XE=${STAGING_BINDIR}/genarch' \ - 'GENCONF_XE=${STAGING_BINDIR}/genconf'" + +do_compile() { + oe_runmake CCAUX="${BUILD_CC}" +} do_install () { oe_runmake 'prefix=${D}${prefix}' \ diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb index 193ae3c0d0..86ca664655 100644 --- a/packages/evince/evince_0.3.2.bb +++ b/packages/evince/evince_0.3.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Evince is simply a document viewer" -LICENSE = "" -DEPENDS = "tiff espgs-native espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" +LICENSE = "GPL" +DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS = "espgs" RRECOMMENDS = "gnome-vfs-plugin-file" diff --git a/packages/gpe-login/gpe-login_0.80.bb b/packages/gpe-login/gpe-login_0.80.bb new file mode 100644 index 0000000000..594bde73c3 --- /dev/null +++ b/packages/gpe-login/gpe-login_0.80.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" diff --git a/packages/gpe-login/gpe-login_0.81.bb b/packages/gpe-login/gpe-login_0.81.bb new file mode 100644 index 0000000000..594bde73c3 --- /dev/null +++ b/packages/gpe-login/gpe-login_0.81.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb new file mode 100644 index 0000000000..76884bd09e --- /dev/null +++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb @@ -0,0 +1,54 @@ +PR = "r1" +PV = "0.16+cvs-${CVSDATE}" + +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser" +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" +DEPENDS = "osb-nrcit libgpewidget" +DEFAULT_PREFERENCE = "-1" + +S = "${WORKDIR}/gpe-mini-browser" + +inherit autotools + +do_install() { + # install -d ${D}${docdir}/gpe + # install -m 0644 ${S}/gpe-mini-browser.html ${D}${docdir}/gpe/ + install -d ${D}/usr/share/applications + install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop + install -d ${D}/usr/share/pixmaps + install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png + autotools_do_install +} + +pkg_postinst_${PN}-doc () { + #!/bin/sh + if [ "x$D" != "x" ]; then + if [ -e /etc/gpe/gpe-help.conf ]; then + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + else + echo [Help] >> /etc/gpe/gpe-help.conf + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi + fi +} + +pkg_postrm_${PN}-doc () { + #!/bin/sh + if [ -e /etc/gpe/gpe-help.conf ]; then + sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf + mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi +} diff --git a/packages/gpe-mixer/gpe-mixer_0.42.bb b/packages/gpe-mixer/gpe-mixer_0.42.bb new file mode 100644 index 0000000000..3d3ef98917 --- /dev/null +++ b/packages/gpe-mixer/gpe-mixer_0.42.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +PR = "r0" + +inherit gpe pkgconfig + +DESCRIPTION = "GPE audio mixer" +DEPENDS = "gtk+ libgpewidget" +SECTION = "gpe" +PRIORITY = "optional" + diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb index 0dc0bdbe7d..7d0e32930c 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre3.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb @@ -1,6 +1,6 @@ inherit autotools pkgconfig -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" diff --git a/packages/gs/gs_8.01.bb b/packages/gs/gs_8.16.bb index 180fd8b32a..cf1e8ba411 100644 --- a/packages/gs/gs_8.01.bb +++ b/packages/gs/gs_8.16.bb @@ -1,21 +1,22 @@ DESCRIPTION = "An interpreter of the Postscript language" LICENSE = "GPL" SECTION = "console/utils" -SRC_URI = "ftp://ftp.gnu.org/gnu/ghostscript/gnughostscript-${PV}.tar.gz" +HOMEPAGE = "http://www.gnu.org/software/ghostscript/ghostscript.html" DEPENDS = "jpeg zlib" -PR = "r2" +PR = "r0" -# | make: ./obj/echogs: Command not found -BROKEN = "1" - -S = "${WORKDIR}/gnughostscript-${PV}" - -FILES_${PN} += "${datadir}/ghostscript" +SRC_URI = "${GNU_MIRROR}/ghostscript/gnu-ghostscript-${PV}.tar.gz" +S = "${WORKDIR}/gnu-ghostscript-${PV}" inherit autotools flow-lossage EXTRA_OECONF = "--without-x" +do_configure() { + gnu-configize + oe_runconf +} + do_compile() { oe_runmake CCAUX="${BUILD_CC}" } @@ -23,3 +24,5 @@ do_compile() { do_install() { oe_runmake bindir='${D}${bindir}' datadir='${D}${datadir}' libdir='${D}${libdir}' install } + +FILES_${PN} += "${datadir}/ghostscript" diff --git a/packages/hostap/hostap-modules-0.3.7/add_event.patch b/packages/hostap/hostap-modules-0.3.7/add_event.patch new file mode 100644 index 0000000000..d5f2a10e86 --- /dev/null +++ b/packages/hostap/hostap-modules-0.3.7/add_event.patch @@ -0,0 +1,28 @@ +Index: hostap-driver-0.3.7/driver/modules/hostap_cs.c +=================================================================== +--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-08-03 17:05:53.000000000 +0100 ++++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-08-03 17:07:59.000000000 +0100 +@@ -526,11 +526,13 @@ + dev_list = link; + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = CS_EVENT_CARD_INSERTION | + CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &prism2_event; ++#endif + client_reg.Version = 0x0210; + client_reg.event_callback_args.client_data = link; + ret = pcmcia_register_client(&link->handle, &client_reg); +@@ -913,6 +915,9 @@ + .name = "hostap_cs", + }, + .attach = prism2_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = prism2_event, ++#endif + .detach = prism2_detach, + .owner = THIS_MODULE, + }; diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb index 81091bf2d8..7e9ea6e13c 100644 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ b/packages/hostap/hostap-modules_0.3.7.bb @@ -8,6 +8,7 @@ PR = "r2" SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ file://hostap_cs.conf \ file://Makefile.patch;patch=1 \ + file://add_event.patch;patch=1 \ file://hostap-utsname.patch;patch=1" SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index dbfde00053..dc7fa37401 100755 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -30,7 +30,7 @@ keycode 13 = keycode 14 = BackSpace altgr keycode 14 = Delete keycode 15 = Tab - altgr keycode 15 = Caps_Lock + shift keycode 65 = Caps_Lock keycode 16 = q keycode 17 = w altgr keycode 17 = asciicircum @@ -143,71 +143,71 @@ string Prior = "\033[5~" string Next = "\033[6~" string Macro = "\033[M" string Pause = "\033[P" -compose '`' 'A' to 'À' -compose '`' 'a' to 'à ' -compose '\'' 'A' to 'Ã' -compose '\'' 'a' to 'á' -compose '^' 'A' to 'Â' -compose '^' 'a' to 'â' -compose '~' 'A' to 'Ã' -compose '~' 'a' to 'ã' -compose '"' 'A' to 'Ä' -compose '"' 'a' to 'ä' -compose 'O' 'A' to 'Ã…' -compose 'o' 'a' to 'Ã¥' -compose '0' 'A' to 'Ã…' -compose '0' 'a' to 'Ã¥' -compose 'A' 'A' to 'Ã…' -compose 'a' 'a' to 'Ã¥' -compose 'A' 'E' to 'Æ' -compose 'a' 'e' to 'æ' -compose ',' 'C' to 'Ç' -compose ',' 'c' to 'ç' -compose '`' 'E' to 'È' -compose '`' 'e' to 'è' -compose '\'' 'E' to 'É' -compose '\'' 'e' to 'é' -compose '^' 'E' to 'Ê' -compose '^' 'e' to 'ê' -compose '"' 'E' to 'Ë' -compose '"' 'e' to 'ë' -compose '`' 'I' to 'ÃŒ' -compose '`' 'i' to 'ì' -compose '\'' 'I' to 'Ã' -compose '\'' 'i' to 'Ã' -compose '^' 'I' to 'ÃŽ' -compose '^' 'i' to 'î' -compose '"' 'I' to 'Ã' -compose '"' 'i' to 'ï' -compose '-' 'D' to 'Ã' -compose '-' 'd' to 'ð' -compose '~' 'N' to 'Ñ' -compose '~' 'n' to 'ñ' -compose '`' 'O' to 'Ã’' -compose '`' 'o' to 'ò' -compose '\'' 'O' to 'Ó' -compose '\'' 'o' to 'ó' -compose '^' 'O' to 'Ô' -compose '^' 'o' to 'ô' -compose '~' 'O' to 'Õ' -compose '~' 'o' to 'õ' -compose '"' 'O' to 'Ö' -compose '"' 'o' to 'ö' -compose '/' 'O' to 'Ø' -compose '/' 'o' to 'ø' -compose '`' 'U' to 'Ù' -compose '`' 'u' to 'ù' -compose '\'' 'U' to 'Ú' -compose '\'' 'u' to 'ú' -compose '^' 'U' to 'Û' -compose '^' 'u' to 'û' -compose '"' 'U' to 'Ãœ' -compose '"' 'u' to 'ü' -compose '\'' 'Y' to 'Ã' -compose '\'' 'y' to 'ý' -compose 'T' 'H' to 'Þ' -compose 't' 'h' to 'þ' -compose 's' 's' to 'ß' -compose '"' 'y' to 'ÿ' -compose 's' 'z' to 'ß' -compose 'i' 'j' to 'ÿ' +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index bf60cec12f..99b2a7dfbd 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r53" +PR = "r54" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff index 15b1bc2928..4f32e7498f 100644 --- a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff +++ b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff @@ -1,5 +1,5 @@ ---- lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 -+++ lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 +--- ./../lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 ++++ ./../lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 @@ -65,7 +65,7 @@ diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb index ef075e8c8a..cca0d78fec 100644 --- a/packages/iperf/iperf_1.7.0.bb +++ b/packages/iperf/iperf_1.7.0.bb @@ -3,14 +3,14 @@ DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tu HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" +PR = "r1" SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \ - file://socketaddr-h-errno.diff;patch=1;pnum=0" + file://socketaddr-h-errno.diff;patch=1" inherit autotools S="${WORKDIR}/iperf-${PV}/cfg" -PATCHES_DIR="${WORKDIR}/iperf-${PV}" do_configure() { oe_runconf diff --git a/packages/kdepimpi/kdepimpi_2.1.16.bb b/packages/kdepimpi/kdepimpi_2.1.18.bb index f3dde1a2fd..f3dde1a2fd 100644 --- a/packages/kdepimpi/kdepimpi_2.1.16.bb +++ b/packages/kdepimpi/kdepimpi_2.1.18.bb diff --git a/packages/kdepimpi/pwmpi_2.1.16.bb b/packages/kdepimpi/pwmpi_2.1.18.bb index 904f640955..904f640955 100644 --- a/packages/kdepimpi/pwmpi_2.1.16.bb +++ b/packages/kdepimpi/pwmpi_2.1.18.bb diff --git a/packages/libsdl/files/.mtn2git_empty b/packages/libsdl/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsdl/files/.mtn2git_empty diff --git a/packages/libsdl/libsdl-x11-1.2.7/acinclude.m4 b/packages/libsdl/files/acinclude.m4 index ca2df9d5e5..ca2df9d5e5 100644 --- a/packages/libsdl/libsdl-x11-1.2.7/acinclude.m4 +++ b/packages/libsdl/files/acinclude.m4 diff --git a/packages/libsdl/libsdl-x11-1.2.7/extra-keys.patch b/packages/libsdl/files/extra-keys.patch index f12f0c7efb..f12f0c7efb 100644 --- a/packages/libsdl/libsdl-x11-1.2.7/extra-keys.patch +++ b/packages/libsdl/files/extra-keys.patch diff --git a/packages/libsdl/libsdl-native_1.2.7.bb b/packages/libsdl/libsdl-native_1.2.7.bb new file mode 100644 index 0000000000..9cd0d82ffc --- /dev/null +++ b/packages/libsdl/libsdl-native_1.2.7.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "Simple DirectMedia Layer - native Edition" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ + file://extra-keys.patch;patch=1 \ + file://acinclude.m4" +S = "${WORKDIR}/SDL-${PV}" + +inherit autotools native + +EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \ + --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \ + --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ + --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \ + --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ + --disable-video-xbios --disable-video-gem --disable-video-dummy \ + --disable-video-opengl --enable-input-events --enable-pthreads \ + --disable-video-picogui --disable-video-qtopia --enable-dlopen" + +do_configure_prepend() { + rm -f ${S}/acinclude.m4 + cp ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_configure_append () { + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage() { + oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} + ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so + #oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR} + install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/SDL + for f in include/*.h + do + install -m 0644 $f ${STAGING_INCDIR}/SDL/ + done + + cat >${STAGING_BINDIR}/sdl-config-native <<EOF +#!/bin/sh + case "\$1" in + --prefix) + echo /usr + ;; + --exec-prefix) + echo /usr + ;; + --version) + echo ${PV} + ;; + --cflags) + echo -I${STAGING_INCDIR}/SDL -D_REENTRANT + ;; + --libs) + echo -lSDLmain -lSDL-1.2 -lpthread -L${STAGING_LIBDIR} + ;; + esac +EOF + chmod a+rx ${STAGING_BINDIR}/sdl-config-native +} diff --git a/packages/libsdl/libsdl-ttf-native_2.0.3.bb b/packages/libsdl/libsdl-ttf-native_2.0.3.bb new file mode 100644 index 0000000000..ced6862ad7 --- /dev/null +++ b/packages/libsdl/libsdl-ttf-native_2.0.3.bb @@ -0,0 +1,10 @@ +include libsdl-ttf_${PV}.bb +inherit native + +DEPENDS = "libsdl-native" +FILESPATH = "${FILE_DIRNAME}/libsdl-ttf-${PV}:${FILE_DIRNAME}/libsdl-ttf:${FILE_DIRNAME}/files" + +EXTRA_OECONF = "--disable-sdltest --with-sdl-prefix=${STAGING_LIBDIR}/.." + +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native" + diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb deleted file mode 100644 index ff4dae1c8e..0000000000 --- a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "x11/libs" -# libxfce4mcs OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="Settings management library used by most XFce 4 modules" -DEPENDS="libxfce4util" - -inherit xfce pkgconfig - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs - - install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} - oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4util/libxfce4util.inc b/packages/libxfce4util/libxfce4util.inc index fcd5b74ad8..dbe6501e42 100644 --- a/packages/libxfce4util/libxfce4util.inc +++ b/packages/libxfce4util/libxfce4util.inc @@ -7,16 +7,6 @@ SECTION = "x11/libs" LICENSE = "GPL" DEPENDS = "glib-2.0" -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="0" - inherit xfce pkgconfig XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ @@ -24,11 +14,18 @@ XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ xfce-fileutils.h xfce-rc.h" +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/xfce4/libxfce4util + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util + install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util done oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} + + install -d ${STAGING_DATADIR}/aclocal/ + install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/ } + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" diff --git a/packages/libxfce4util/libxfce4util_4.2.0.bb b/packages/libxfce4util/libxfce4util_4.2.0.bb deleted file mode 100644 index fcd5b74ad8..0000000000 --- a/packages/libxfce4util/libxfce4util_4.2.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -# libxfce4util OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPL" -DEPENDS = "glib-2.0" - -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="0" - -inherit xfce pkgconfig - -XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ - i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ - xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ - xfce-fileutils.h xfce-rc.h" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/xfce4/libxfce4util - for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util - done - - oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4util/libxfce4util_4.2.2.bb b/packages/libxfce4util/libxfce4util_4.2.2.bb index 0fbc5321bb..e89d2cfa97 100644 --- a/packages/libxfce4util/libxfce4util_4.2.2.bb +++ b/packages/libxfce4util/libxfce4util_4.2.2.bb @@ -3,11 +3,5 @@ # Released under the MIT license (see packages/COPYING) include ${PN}.inc +PR = "r1" -MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" -FILES_${PN}-dev += " ${datadir}/xfce4/m4" - -do_stage() { - install -d ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/libxfcegui4/libxfcegui4.inc b/packages/libxfcegui4/libxfcegui4.inc index 36a125b747..882cf3a55b 100644 --- a/packages/libxfcegui4/libxfcegui4.inc +++ b/packages/libxfcegui4/libxfcegui4.inc @@ -2,15 +2,12 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE Widget library and X Window System interaction" -DEPENDS="libxfce4util dbh libxml2 gtk+" +DESCRIPTION = "XFCE Widget library and X Window System interaction" +DEPENDS = "libxfce4util dbh libxml2 gtk+" SECTION = "x11/libs" inherit xfce pkgconfig -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ gtk_style.h netk-util.h xfce_aboutdialog.h \ gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ @@ -29,17 +26,17 @@ XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules + install -d ${STAGING_INCDIR}/libxfcegui4 + install -d ${STAGING_INCDIR}/xfce4-modules + install -d ${STAGING_LIBDIR}/modules for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 + install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/libxfcegui4 done for file in ${MODULE_HEADERS}; do install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules + ${STAGING_INCDIR}/xfce4-modules done oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} @@ -51,3 +48,5 @@ do_stage() { oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ ${STAGING_LIBDIR}/xfce4/modules } + +FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/libxfcegui4/libxfcegui4_4.2.0.bb b/packages/libxfcegui4/libxfcegui4_4.2.0.bb deleted file mode 100644 index 4eb5d8a781..0000000000 --- a/packages/libxfcegui4/libxfcegui4_4.2.0.bb +++ /dev/null @@ -1,53 +0,0 @@ -SECTION = "x11/libs" -# libxfcegui4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE Widget library and X Window System interaction" -DEPENDS="libxfce4util dbh libxml2 gtk+" - -inherit xfce pkgconfig - -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - -XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ - gtk_style.h netk-util.h xfce_aboutdialog.h \ - gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ - icons.h netk-window-menu.h xfce_decorbutton.h \ - libnetk.h netk-window.h xfce_decortoggle.h \ - libxfcegui4-config.h netk-workspace.h xfce_framebox.h \ - libxfcegui4.h preview_filesel.h xfce_iconbutton.h \ - netk-application.h session-client.h xfce_marshal.h \ - netk-class-group.h xfce-appmenuitem.h xfce_menubutton.h \ - netk-enum-types.h xfce-colorbutton.h xfce_movehandler.h \ - netk-marshal.h xfce-exec.h xfce_scaled_image.h \ - netk-pager.h xfce-filechooser.h xfce_systemtray.h \ - netk-screen.h xfce-gdk-extensions.h xfce_togglebutton.h \ - netk-tasklist.h xfce-gtk-extensions.h xinerama.h" - -MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules - - for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 - done - - for file in ${MODULE_HEADERS}; do - install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules - done - - oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} - - oe_libinstall -C xfce4-modules/mime-icons -so libxfce4_mime_icons \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/combo -so libxfce4_combo \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ - ${STAGING_LIBDIR}/xfce4/modules -} diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb index 2c7042c7ca..7e7df86702 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r0" +PR = "r1" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -25,6 +25,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \ ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \ + ${RPSRC}/reverse_pagefault-r0.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \ @@ -40,14 +41,14 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ - ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ + ${RPSRC}/corgi_base_extras1-r3.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/corgi_power-r24.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${RPSRC}/mmc_sd-r5.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ - ${RPSRC}/corgi_snd-r6.patch;patch=1 \ + ${RPSRC}/corgi_snd-r8.patch;patch=1 \ ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \ diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle index 6102a630c0..e318a9f427 100644 --- a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle +++ b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle @@ -123,6 +123,8 @@ CONFIG_ARCH_PXA_POODLE=y # CONFIG_ARCH_PXA_SHEPHERD is not set # CONFIG_ARCH_PXA_HUSKY is not set # CONFIG_ARCH_PXA_BOXER is not set +# CONFIG_ARCH_PXA_TOSA is not set +# CONFIG_ARCH_PXA_TOSA_SKIP is not set CONFIG_ARCH_SHARP_SL=y CONFIG_SL_CCCR_CHANGE=y CONFIG_SL_CCCR242=y @@ -389,6 +391,7 @@ CONFIG_NET_IPGRE=m # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set +# CONFIG_IPSEC is not set # # Network device support @@ -581,12 +584,12 @@ CONFIG_BLK_DEV_IDECS=y # # Input core support # -# CONFIG_INPUT is not set -# CONFIG_INPUT_KEYBDEV is not set +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_UINPUT=m # # Character devices @@ -597,8 +600,14 @@ CONFIG_SERIAL=y # CONFIG_SERIAL_CONSOLE is not set CONFIG_SERIAL_SL_SERIES=y # CONFIG_SL_TS_PRESSURE is not set +# CONFIG_BOOT_PRESSURE_ON is not set # CONFIG_SL7X0_POWER_KEY_OFF is not set +# CONFIG_BOOT_POWER_KEY_OFF is not set # CONFIG_SL_3BUTTON_PATCH is not set +# CONFIG_BOOT_3BUTTON_PATCH_ON is not set +# CONFIG_SL_WRITE_TS is not set +# CONFIG_BLUETOOTH_SL is not set +# CONFIG_KBD_DEV_FILE is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -653,6 +662,32 @@ CONFIG_UNIX98_PTY_COUNT=256 # Joysticks # # CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +# CONFIG_INPUT_SERIO is not set +# CONFIG_INPUT_SERPORT is not set +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set # CONFIG_QIC02_TAPE is not set # @@ -664,6 +699,7 @@ CONFIG_UNIX98_PTY_COUNT=256 # CONFIG_RTC is not set CONFIG_COTULLA_RTC=y CONFIG_ADS7846_TS=y +# CONFIG_TOSA_TS is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -857,6 +893,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_FB_POODLE=y CONFIG_POODLE_CONSISTENT_ALLOC=y # CONFIG_FB_CORGI is not set +# CONFIG_FB_TOSA is not set # CONFIG_SHARP_LOGO_SCREEN is not set # CONFIG_SL_SYSCLK100 is not set # CONFIG_FB_CYBER2000 is not set @@ -887,6 +924,7 @@ CONFIG_FBCON_FONTS=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_6x11 is not set +# CONFIG_FONT_5x8 is not set CONFIG_FONT_4x6=y # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set @@ -921,6 +959,8 @@ CONFIG_SOUND=y # CONFIG_SOUND_PXA_AC97 is not set CONFIG_SOUND_POODLE=y # CONFIG_SOUND_CORGI is not set +# CONFIG_SOUND_TOSA is not set +# CONFIG_BUZZER_TOSA is not set # CONFIG_SOUND_TVMIXER is not set # @@ -945,6 +985,8 @@ CONFIG_USB=m # CONFIG_USB_UHCI_ALT is not set # CONFIG_USB_OHCI is not set # CONFIG_USB_OHCI_SA1111 is not set +# CONFIG_USB_OHCI_TC6393 is not set +# CONFIG_USB_USE_INTERNAL_MEMORY is not set # CONFIG_USB_AUDIO is not set # CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE_DEBUG is not set @@ -957,6 +999,11 @@ CONFIG_USB=m # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set +# CONFIG_USB_HID is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set # CONFIG_USB_SCANNER is not set @@ -1073,6 +1120,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y CONFIG_BLUEZ_BNEP=m CONFIG_BLUEZ_BNEP_MC_FILTER=y CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +# CONFIG_BLUEZ_HIDP is not set # # Bluetooth device drivers diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index acaeb5b189..548d87c1a2 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -7,7 +7,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r40" +PR = "r41" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ @@ -42,8 +42,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \ file://1764-1.patch;patch=1 \ file://module_licence.patch;patch=1 \ - file://iw249_we16-6.diff;patch=1 \ - file://iw249_we17-13.diff;patch=1 \ + http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \ + http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we17-13.diff;patch=1 \ file://ir240_sys_max_tx-2.diff;patch=1 \ file://ir241_qos_param-2.diff;patch=1 \ http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz \ diff --git a/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie index 531c7385e3..6f0bf1e10d 100644 --- a/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie +++ b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_ARM=y # CONFIG_EISA is not set @@ -46,10 +46,6 @@ CONFIG_ARCH_SA1100=y # # Archimedes/A5000 Implementations # - -# -# Archimedes/A5000 Implementations (select only ONE) -# # CONFIG_ARCH_ARC is not set # CONFIG_ARCH_A5K is not set @@ -146,10 +142,6 @@ CONFIG_ARCH_SHARP_SL=y # CONFIG_FOOTBRIDGE_ADDIN is not set CONFIG_CPU_32=y # CONFIG_CPU_26 is not set - -# -# Processor Type -# # CONFIG_CPU_32v3 is not set CONFIG_CPU_32v4=y # CONFIG_CPU_ARM610 is not set @@ -191,10 +183,6 @@ CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y - -# -# At least one math emulation must be selected -# CONFIG_FPE_NWFPE=y # CONFIG_FPE_FASTFPE is not set CONFIG_KCORE_ELF=y @@ -209,7 +197,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="See OE File" +CONFIG_CMDLINE="<see openzaurus-sa_*.bb file in OpenEmbedded metadata>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y @@ -234,10 +222,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_CACKO_HYBRID_PARTITIONS is not set # CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set - -# -# User Modules And Translation Layers -# CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -288,17 +272,10 @@ CONFIG_MTD_SA1100=y # CONFIG_MTD_PMC551 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_MTDROM_SA1100 is not set -CONFIG_MTD_MTDRAM_SA1100=y -CONFIG_MTDRAM_TOTAL_SIZE=16384 -CONFIG_MTDRAM_ERASE_SIZE=1 -CONFIG_MTDRAM_ABS_POS=C1000000 +# CONFIG_MTD_MTDRAM_SA1100 is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_MTDRAM_SHARP_SL is not set # CONFIG_MTD_BLKMTD is not set - -# -# Disk-On-Chip Device Drivers -# # CONFIG_MTD_DOC1000 is not set # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set @@ -418,10 +395,6 @@ CONFIG_IP6_NF_TARGET_MARK=m # CONFIG_KHTTPD is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -440,10 +413,6 @@ CONFIG_IP6_NF_TARGET_MARK=m # # CONFIG_NET_SCHED is not set CONFIG_IPSEC=m - -# -# IPSec options (Openswan) -# CONFIG_IPSEC_IPIP=y CONFIG_IPSEC_AH=y # CONFIG_IPSEC_AUTH_HMAC_MD5 is not set @@ -452,6 +421,8 @@ CONFIG_IPSEC_ESP=y CONFIG_IPSEC_ENC_3DES=y # CONFIG_IPSEC_ENC_AES is not set CONFIG_IPSEC_ALG=y +# CONFIG_IPSEC_ALG_AES is not set +# CONFIG_IPSEC_ALG_CRYPTOAPI is not set CONFIG_IPSEC_IPCOMP=y CONFIG_IPSEC_DEBUG=y @@ -525,10 +496,6 @@ CONFIG_NET_RADIO=y # CONFIG_AIRONET4500_PROC is not set # CONFIG_AIRO is not set # CONFIG_HERMES is not set - -# -# Wireless Pcmcia cards support -# # CONFIG_PCMCIA_HERMES is not set # CONFIG_AIRO_CS is not set CONFIG_NET_WIRELESS=y @@ -575,18 +542,10 @@ CONFIG_NET_PCMCIA_RADIO=y # IrDA (infrared) support # CONFIG_IRDA=y - -# -# IrDA protocols -# # CONFIG_IRLAN is not set CONFIG_IRNET=m CONFIG_IRCOMM=y # CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# # CONFIG_IRDA_CACHE_LAST_LSAP is not set CONFIG_IRDA_FAST_RR=y # CONFIG_IRDA_DEBUG is not set @@ -594,21 +553,9 @@ CONFIG_IRDA_FAST_RR=y # # Infrared-port device drivers # - -# -# SIR device drivers -# CONFIG_IRTTY_SIR=y CONFIG_IRPORT_SIR=y - -# -# Dongle support -# # CONFIG_DONGLE is not set - -# -# FIR device drivers -# # CONFIG_USB_IRDA is not set # CONFIG_NSC_FIR is not set # CONFIG_WINBOND_FIR is not set @@ -627,10 +574,6 @@ CONFIG_IDE=y # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y @@ -649,10 +592,6 @@ CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set - -# -# IDE chipset support/bugfixes -# # CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_CMD640_ENHANCED is not set # CONFIG_BLK_DEV_ISAPNP is not set @@ -686,12 +625,12 @@ CONFIG_BLK_DEV_IDECS=y # # Input core support # -# CONFIG_INPUT is not set -# CONFIG_INPUT_KEYBDEV is not set +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_UINPUT=m # # Character devices @@ -748,10 +687,6 @@ CONFIG_UNIX98_PTY_COUNT=32 # CONFIG_L3 is not set # CONFIG_L3_ALGOBIT is not set # CONFIG_L3_BIT_SA1100_GPIO is not set - -# -# Other L3 adapters -# # CONFIG_L3_SA1111 is not set # CONFIG_BIT_SA1100_GPIO is not set @@ -765,14 +700,32 @@ CONFIG_UNIX98_PTY_COUNT=32 # Joysticks # # CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +# CONFIG_INPUT_SERIO is not set +# CONFIG_INPUT_SERPORT is not set +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set # CONFIG_QIC02_TAPE is not set # @@ -1051,34 +1004,14 @@ CONFIG_SOUND_COLLIE_TC35143=y # CONFIG_USB=m # CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# # CONFIG_USB_DEVICEFS is not set # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_LONG_TIMEOUT is not set - -# -# USB Controllers -# # CONFIG_USB_UHCI is not set # CONFIG_USB_UHCI_ALT is not set # CONFIG_USB_OHCI is not set # CONFIG_USB_OHCI_SA1111 is not set - -# -# USB Device Class drivers -# # CONFIG_USB_AUDIO is not set - -# -# USB Bluetooth can only be used with disabled Bluetooth subsystem -# - -# -# SCSI support is needed for USB Storage -# # CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set @@ -1090,44 +1023,21 @@ CONFIG_USB=m # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set - -# -# USB Human Interface Devices (HID) -# - -# -# Input core support is needed for USB HID -# - -# -# USB Imaging devices -# +# CONFIG_USB_HID is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set # CONFIG_USB_SCANNER is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USB_HPUSBSCSI is not set - -# -# USB Multimedia devices -# - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# -# USB Network adaptors -# # CONFIG_USB_PEGASUS is not set # CONFIG_USB_KAWETH is not set # CONFIG_USB_CATC is not set # CONFIG_USB_CDCETHER is not set # CONFIG_USB_USBNET is not set - -# -# USB port drivers -# # CONFIG_USB_USS720 is not set # @@ -1160,10 +1070,6 @@ CONFIG_USB=m # CONFIG_USB_SERIAL_CYBERJACK is not set # CONFIG_USB_SERIAL_XIRCOM is not set # CONFIG_USB_SERIAL_OMNINET is not set - -# -# USB Miscellaneous drivers -# # CONFIG_USB_RIO500 is not set # @@ -1178,17 +1084,9 @@ CONFIG_USBD_USE_SERIAL_NUMBER=y CONFIG_USBD_SERIAL_NUMBER_STR="A01234" CONFIG_USBD_SELFPOWERED=y CONFIG_USBD_MONITOR=m - -# -# -# CONFIG_USBD_PROCFS=y # -# USB Device functions -# - -# # Network Function # CONFIG_USBD_NET=m @@ -1223,10 +1121,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE=64 # CONFIG_USBD_SERIAL_SAFE is not set # -# USB Device bus interfaces -# - -# # USB Device Bus Interface Support # CONFIG_USBD_SA1100_BUS=m diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index 63df6a88cf..62e9d31858 100644 --- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -6,7 +6,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20030509" -PR = "r21" +PR = "r22" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \ diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb new file mode 100644 index 0000000000..8a32b9cb70 --- /dev/null +++ b/packages/meta/openslug-native-packages.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware" +LICENSE = MIT +PR = "r2" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +# Just something the test with +OPENSLUG_NATIVE_PACKAGES = "\ + gzip \ + vlan \ + " + +BROKEN_PACKAGES = "\ + " + +DEPENDS = '${OPENSLUG_NATIVE_PACKAGES} \ + package-index' diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index bb5a68d01e..b52d2ef6eb 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,12 +1,13 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r7" +PR = "r10" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" OPENSLUG_NATIVE = "\ + autoconf \ automake \ bash \ binutils binutils-dev binutils-symlinks \ @@ -29,6 +30,7 @@ OPENSLUG_NATIVE = "\ libreadline4 libreadline-dev \ libstdc++-dev \ libthread-db1 \ + libtool \ lrzsz \ m4 \ make \ @@ -36,7 +38,9 @@ OPENSLUG_NATIVE = "\ ncurses ncurses-dev ncurses-terminfo \ patch \ perl perl-modules \ - python-core python-io python-lang python-pickle python-shell python-textutils \ + pkgconfig \ + python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \ + quilt \ sed \ tar \ util-linux \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7e248bc60e..6d16f9039d 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,24 +34,20 @@ OPENSLUG_DEVELOPMENT = "\ openssh \ patch \ pciutils \ + perl \ pkgconfig \ quilt \ sed \ strace \ - util-linux \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc -OPENSLUG_DEVELOPMENT_append_linux = "\ - perl \ tar \ + util-linux \ " OPENSLUG_PACKAGES = "\ atftp \ bash \ + bind \ bluez-utils-nodbus \ bridge-utils \ bwmon \ @@ -60,70 +56,69 @@ OPENSLUG_PACKAGES = "\ cron \ cvs\ cyrus-imapd \ + db4 \ dnsmasq \ expat \ ftpd-topfield \ glib-2.0 \ gphoto2 \ gtk-doc \ + iperf \ + jpeg \ less \ + libpam \ + libpng \ libusb \ libxml2 \ + man man-pages \ + mgetty \ miau \ microcom \ + mpd \ mt-daapd \ mutt \ mysql \ nail \ nano \ ncftp \ + netpbm \ + nfs-utils \ + ntp \ obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ openssh \ openvpn \ pcre \ + php \ + postfix \ ppp \ procps \ + psmisc \ puppy \ pwc \ + python \ + reiserfsprogs reiser4progs \ rsync \ + samba \ + sane-backends \ + screen \ setpwc \ + strace \ + streamripper \ sudo \ sysfsutils \ thttpd \ - db4 \ - openldap \ - openntpd \ - ntp \ - reiserfsprogs reiser4progs \ - python \ - samba \ - sane-backends \ - strace \ thttpd \ + tiff \ + timezones \ + unionfs-modules unionfs-utils \ vlan \ + wakelan \ wget \ - unionfs-modules unionfs-utils \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc (Note that for several this -# is because of use of single precision FP interfaces -# such as sinf.) -OPENSLUG_PACKAGES_append_linux = "\ - bind \ - man man-pages \ - mgetty \ - mpd \ - nfs-utils \ - libpam \ - php \ - postfix \ - psmisc \ - screen \ - streamripper \ - timezones \ xinetd \ yp-tools ypbind ypserv \ + zlib \ " BROKEN_PACKAGES = "\ diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb new file mode 100644 index 0000000000..7074cfff48 --- /dev/null +++ b/packages/meta/ucslugc-packages.bb @@ -0,0 +1,132 @@ +# Meta package containing all the packages which build for UcSlugC +# +# All packages in here must build with the ucslugc.conf distro, they +# do not necessarily work. +DESCRIPTION = "Packages that are compatible with the UcSlugC firmware" +LICENSE = MIT +PR = "r0" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +# The list of packages to build for the ucslugc DISTRO. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_PACKAGES = "\ + atftp \ + autoconf \ + automake \ + bash \ + binutils \ + bison \ + bluez-utils-nodbus \ + bridge-utils \ + bwmon \ + bzip2 \ + ccxstream \ + coreutils \ + cron \ + cvs \ + cvs\ + cyrus-imapd \ + db4 \ + diffutils \ + dnsmasq \ + expat \ + findutils \ + flex \ + ftpd-topfield \ + gawk \ + gcc \ + gdb \ + glib-2.0 \ + gnu-config \ + gphoto2 \ + grep \ + gtk-doc \ + gzip \ + ipkg-utils \ + jpeg \ + less \ + libpng \ + libtool \ + libusb \ + libxml2 \ + lsof \ + m4 \ + make \ + miau \ + microcom \ + monotone-4 monotone-5 \ + mpd \ + mt-daapd \ + mutt \ + mysql \ + nail \ + nano \ + ncftp \ + ncurses \ + netpbm \ + ntp \ + obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ + openssh \ + openvpn \ + patch \ + pciutils \ + pcre \ + perl \ + pkgconfig \ + ppp \ + procps \ + puppy \ + pwc \ + python \ + quilt \ + reiserfsprogs reiser4progs \ + rsync \ + samba \ + sane-backends \ + sed \ + setpwc \ + strace \ + streamripper \ + sudo \ + sysfsutils \ + thttpd \ + tiff \ + unionfs-modules unionfs-utils \ + util-linux \ + vlan \ + wakelan \ + wget \ + zlib \ + " + +# These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_BROKEN_PACKAGES = "\ + bind \ + libpam \ + man man-pages \ + mgetty \ + php \ + postfix \ + psmisc \ + screen \ + tar \ + timezones \ + xinetd \ + " + +# These packages will never build because uclibc lacks (and always will lack) +# appropriate support. This define is for documentation of this fact! +UCSLUGC_UNSUPPORTABLE_PACKAGES = "\ + nfs-utils \ + yp-tools ypbind ypserv \ + " + +# The package-index at the end causes regeneration of the Packages.gz and +# other control files. +DEPENDS = "openslug-image ${UCSLUGC_PACKAGES} package-index" diff --git a/packages/minimix/minimix_0.7.bb b/packages/minimix/minimix_0.7.bb index 8a6f94ef25..484393c322 100644 --- a/packages/minimix/minimix_0.7.bb +++ b/packages/minimix/minimix_0.7.bb @@ -5,5 +5,5 @@ SECTION = "gpe" DEPENDS = "libgpewidget" -GPE_SRC_COMPRESSION = "bz2" +GPE_TARBALL_SUFFIX = "bz2" inherit gpe autotools diff --git a/packages/mutt/mutt-1.5.9i/.mtn2git_empty b/packages/mutt/mutt-1.5.9i/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mutt/mutt-1.5.9i/.mtn2git_empty diff --git a/packages/mutt/mutt-1.5.9i/cppflags.patch b/packages/mutt/mutt-1.5.9i/cppflags.patch new file mode 100644 index 0000000000..774bc020ed --- /dev/null +++ b/packages/mutt/mutt-1.5.9i/cppflags.patch @@ -0,0 +1,11 @@ +--- mutt-1.5.9/Makefile.am.orig 2005-08-04 08:58:08.169498584 +0000 ++++ mutt-1.5.9/Makefile.am 2005-08-04 08:58:30.514101688 +0000 +@@ -55,7 +55,7 @@ + + INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl + +-CPPFLAGS=@CPPFLAGS@ -I$(includedir) ++CPPFLAGS=@CPPFLAGS@ + + + EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \ diff --git a/packages/mutt/mutt-1.5.9i/makedoc.patch b/packages/mutt/mutt-1.5.9i/makedoc.patch new file mode 100644 index 0000000000..f2b64a6f22 --- /dev/null +++ b/packages/mutt/mutt-1.5.9i/makedoc.patch @@ -0,0 +1,11 @@ +--- mutt-1.5.9/makedoc.c.orig 2005-08-04 10:26:18.686217792 +0000 ++++ mutt-1.5.9/makedoc.c 2005-08-04 10:26:36.254547000 +0000 +@@ -49,7 +49,7 @@ + #ifndef HAVE_STRERROR + #ifndef STDC_HEADERS + extern int sys_nerr; +-extern char *sys_errlist[]; ++extern __const char *__const sys_errlist[]; + #endif + + #define strerror(x) ((x) > 0 && (x) < sys_nerr) ? sys_errlist[(x)] : 0 diff --git a/packages/mutt/mutt-1.5.9i/patch-1.5.9i.sidebar.20050628.txt.hackedfornntp b/packages/mutt/mutt-1.5.9i/patch-1.5.9i.sidebar.20050628.txt.hackedfornntp new file mode 100644 index 0000000000..ebe6a1b014 --- /dev/null +++ b/packages/mutt/mutt-1.5.9i/patch-1.5.9i.sidebar.20050628.txt.hackedfornntp @@ -0,0 +1,1527 @@ +diff -N -c -r mutt-1.5.9i-orig/buffy.c mutt-1.5.9i-patched/buffy.c +*** mutt-1.5.9i-orig/buffy.c 2005-02-03 13:47:52.000000000 -0500 +--- mutt-1.5.9i-patched/buffy.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 267,273 **** + char path[_POSIX_PATH_MAX]; + struct stat contex_sb; + time_t t; +! + #ifdef USE_IMAP + /* update postponed count as well, on force */ + if (force) +--- 267,273 ---- + char path[_POSIX_PATH_MAX]; + struct stat contex_sb; + time_t t; +! CONTEXT *ctx; + #ifdef USE_IMAP + /* update postponed count as well, on force */ + if (force) +*************** +*** 300,305 **** +--- 300,307 ---- + + for (tmp = Incoming; tmp; tmp = tmp->next) + { ++ if ( tmp->new == 1 ) ++ tmp->has_new = 1; + tmp->new = 0; + + #ifdef USE_IMAP +*************** +*** 353,362 **** + case M_MBOX: + case M_MMDF: + +! if (STAT_CHECK) + { + BuffyCount++; +! tmp->new = 1; + } + #ifdef BUFFY_SIZE + else +--- 355,380 ---- + case M_MBOX: + case M_MMDF: + +! { +! if (STAT_CHECK || tmp->msgcount == 0) + { ++ BUFFY b = *tmp; ++ int msgcount = 0; ++ int msg_unread = 0; + BuffyCount++; +! /* parse the mailbox, to see how much mail there is */ +! ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); +! if(ctx) +! { +! msgcount = ctx->msgcount; +! msg_unread = ctx->unread; +! mx_close_mailbox(ctx, 0); +! } +! *tmp = b; +! tmp->msgcount = msgcount; +! tmp->msg_unread = msg_unread; +! if(STAT_CHECK) +! tmp->has_new = tmp->new = 1; + } + #ifdef BUFFY_SIZE + else +*************** +*** 368,408 **** + if (tmp->newly_created && + (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) + tmp->newly_created = 0; +! + break; + + case M_MAILDIR: + + snprintf (path, sizeof (path), "%s/new", tmp->path); + if ((dirp = opendir (path)) == NULL) + { + tmp->magic = 0; + break; + } + while ((de = readdir (dirp)) != NULL) + { + char *p; + if (*de->d_name != '.' && + (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) + { +! /* one new and undeleted message is enough */ +! BuffyCount++; +! tmp->new = 1; +! break; + } + } + closedir (dirp); + break; + + case M_MH: +! if ((tmp->new = mh_buffy (tmp->path)) > 0) +! BuffyCount++; + break; + + #ifdef USE_IMAP + case M_IMAP: +! if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) + BuffyCount++; + else + tmp->new = 0; + +--- 386,471 ---- + if (tmp->newly_created && + (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) + tmp->newly_created = 0; +! } + break; + + case M_MAILDIR: + ++ /* count new message */ + snprintf (path, sizeof (path), "%s/new", tmp->path); + if ((dirp = opendir (path)) == NULL) + { + tmp->magic = 0; + break; + } ++ tmp->msgcount = 0; ++ tmp->msg_unread = 0; + while ((de = readdir (dirp)) != NULL) + { + char *p; + if (*de->d_name != '.' && + (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) + { +! tmp->has_new = tmp->new = 1; +! tmp->msgcount++; +! tmp->msg_unread++; +! } +! } +! if(tmp->msg_unread) +! BuffyCount++; +! +! closedir (dirp); +! +! /* +! * count read messages (for folderlist (sidebar) we also need to count +! * messages in cur so that we the total number of messages +! */ +! snprintf (path, sizeof (path), "%s/cur", tmp->path); +! if ((dirp = opendir (path)) == NULL) +! { +! tmp->magic = 0; +! break; +! } +! while ((de = readdir (dirp)) != NULL) +! { +! char *p; +! if (*de->d_name != '.' && +! (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) +! { +! tmp->msgcount++; + } + } + closedir (dirp); + break; + + case M_MH: +! { +! DIR *dp; +! struct dirent *de; +! if ((tmp->new = mh_buffy (tmp->path)) > 0) +! BuffyCount++; +! +! if ((dp = opendir (path)) == NULL) +! break; +! tmp->msgcount = 0; +! while ((de = readdir (dp))) +! { +! if (mh_valid_message (de->d_name)) +! { +! tmp->msgcount++; +! tmp->has_new = tmp->new = 1; +! } +! } +! closedir (dp); +! } + break; + + #ifdef USE_IMAP + case M_IMAP: +! tmp->msgcount = imap_mailbox_check(tmp->path, 0); +! if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) { + BuffyCount++; ++ } + else + tmp->new = 0; + +diff -N -c -r mutt-1.5.9i-orig/buffy.h mutt-1.5.9i-patched/buffy.h +*** mutt-1.5.9i-orig/buffy.h 2002-12-11 06:19:39.000000000 -0500 +--- mutt-1.5.9i-patched/buffy.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 27,33 **** +--- 27,37 ---- + long size; + #endif /* BUFFY_SIZE */ + struct buffy_t *next; ++ struct buffy_t *prev; + short new; /* mailbox has new mail */ ++ short has_new; /* set it new if new and not read */ ++ int msgcount; /* total number of messages */ ++ int msg_unread; /* number of unread messages */ + short notified; /* user has been notified */ + short magic; /* mailbox type */ + short newly_created; /* mbox or mmdf just popped into existence */ +diff -N -c -r mutt-1.5.9i-orig/color.c mutt-1.5.9i-patched/color.c +*** mutt-1.5.9i-orig/color.c 2005-02-03 13:47:52.000000000 -0500 +--- mutt-1.5.9i-patched/color.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 93,98 **** +--- 93,99 ---- + { "bold", MT_COLOR_BOLD }, + { "underline", MT_COLOR_UNDERLINE }, + { "index", MT_COLOR_INDEX }, ++ { "sidebar_new", MT_COLOR_NEW }, + { NULL, 0 } + }; + +diff -N -c -r mutt-1.5.9i-orig/compose.c mutt-1.5.9i-patched/compose.c +*** mutt-1.5.9i-orig/compose.c 2005-02-03 13:47:52.000000000 -0500 +--- mutt-1.5.9i-patched/compose.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 72,78 **** + + #define HDR_XOFFSET 10 + #define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */ +! #define W (COLS - HDR_XOFFSET) + + static char *Prompts[] = + { +--- 72,78 ---- + + #define HDR_XOFFSET 10 + #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */ +! #define W (COLS - HDR_XOFFSET - SidebarWidth) + + static char *Prompts[] = + { +*************** +*** 148,154 **** + } + clrtoeol (); + +! move (HDR_CRYPTINFO, 0); + clrtoeol (); + if ((WithCrypto & APPLICATION_PGP) + && msg->security & APPLICATION_PGP && msg->security & SIGN) +--- 148,154 ---- + } + clrtoeol (); + +! move (HDR_CRYPTINFO, SidebarWidth); + clrtoeol (); + if ((WithCrypto & APPLICATION_PGP) + && msg->security & APPLICATION_PGP && msg->security & SIGN) +*************** +*** 164,170 **** + && (msg->security & ENCRYPT) + && SmimeCryptAlg + && *SmimeCryptAlg) { +! mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "), + NONULL(SmimeCryptAlg)); + off = 20; + } +--- 164,170 ---- + && (msg->security & ENCRYPT) + && SmimeCryptAlg + && *SmimeCryptAlg) { +! mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "), + NONULL(SmimeCryptAlg)); + off = 20; + } +*************** +*** 178,184 **** + int c; + char *t; + +! mvaddstr (HDR_MIX, 0, " Mix: "); + + if (!chain) + { +--- 178,184 ---- + int c; + char *t; + +! mvaddstr (HDR_MIX, SidebarWidth, " Mix: "); + + if (!chain) + { +*************** +*** 193,199 **** + if (t && t[0] == '0' && t[1] == '\0') + t = "<random>"; + +! if (c + mutt_strlen (t) + 2 >= COLS) + break; + + addstr (NONULL(t)); +--- 193,199 ---- + if (t && t[0] == '0' && t[1] == '\0') + t = "<random>"; + +! if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth) + break; + + addstr (NONULL(t)); +*************** +*** 245,251 **** + + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), addr, 1); +! mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]); + mutt_paddstr (W, buf); + } + +--- 245,251 ---- + + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), addr, 1); +! mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]); + mutt_paddstr (W, buf); + } + +*************** +*** 269,275 **** + #endif + + SETCOLOR (MT_COLOR_STATUS); +! mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments")); + BKGDSET (MT_COLOR_STATUS); + clrtoeol (); + +--- 269,275 ---- + #endif + + SETCOLOR (MT_COLOR_STATUS); +! mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments")); + BKGDSET (MT_COLOR_STATUS); + clrtoeol (); + +*************** +*** 307,313 **** + /* redraw the expanded list so the user can see the result */ + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), *addr, 1); +! move (line, HDR_XOFFSET); + mutt_paddstr (W, buf); + + return 0; +--- 307,313 ---- + /* redraw the expanded list so the user can see the result */ + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), *addr, 1); +! move (line, HDR_XOFFSET+SidebarWidth); + mutt_paddstr (W, buf); + + return 0; +*************** +*** 553,559 **** + if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) + { + mutt_str_replace (&msg->env->subject, buf); +! move (HDR_SUBJECT, HDR_XOFFSET); + clrtoeol (); + if (msg->env->subject) + mutt_paddstr (W, msg->env->subject); +--- 553,559 ---- + if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) + { + mutt_str_replace (&msg->env->subject, buf); +! move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth); + clrtoeol (); + if (msg->env->subject) + mutt_paddstr (W, msg->env->subject); +*************** +*** 570,576 **** + { + strfcpy (fcc, buf, _POSIX_PATH_MAX); + mutt_pretty_mailbox (fcc); +! move (HDR_FCC, HDR_XOFFSET); + mutt_paddstr (W, fcc); + fccSet = 1; + } +--- 570,576 ---- + { + strfcpy (fcc, buf, _POSIX_PATH_MAX); + mutt_pretty_mailbox (fcc); +! move (HDR_FCC, HDR_XOFFSET + SidebarWidth); + mutt_paddstr (W, fcc); + fccSet = 1; + } +diff -N -c -r mutt-1.5.9i-orig/curs_main.c mutt-1.5.9i-patched/curs_main.c +*** mutt-1.5.9i-orig/curs_main.c 2005-02-28 13:36:35.000000000 -0500 +--- mutt-1.5.9i-patched/curs_main.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 28,33 **** +--- 28,34 ---- + #include "sort.h" + #include "buffy.h" + #include "mx.h" ++ #include "sidebar.h" + + #ifdef USE_POP + #include "pop.h" +*************** +*** 538,543 **** +--- 539,545 ---- + if (menu->redraw & REDRAW_FULL) + { + menu_redraw_full (menu); ++ draw_sidebar(menu->menu); + mutt_show_error (); + } + +*************** +*** 560,570 **** +--- 562,575 ---- + + if (menu->redraw & REDRAW_STATUS) + { ++ DrawFullLine = 1; + menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); ++ DrawFullLine = 0; + CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2); + SETCOLOR (MT_COLOR_STATUS); + mutt_paddstr (COLS, buf); + SETCOLOR (MT_COLOR_NORMAL); ++ set_buffystats(Context); + menu->redraw &= ~REDRAW_STATUS; + } + +*************** +*** 1040,1045 **** +--- 1045,1051 ---- + menu->redraw = REDRAW_FULL; + break; + ++ case OP_SIDEBAR_OPEN: + case OP_MAIN_CHANGE_FOLDER: + + if (attach_msg) +*************** +*** 1057,1063 **** + buf[0] = '\0'; + mutt_buffy (buf, sizeof (buf)); + +! if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) + break; + if (!buf[0]) + { +--- 1063,1073 ---- + buf[0] = '\0'; + mutt_buffy (buf, sizeof (buf)); + +! if ( op == OP_SIDEBAR_OPEN ) { +! if(!CurBuffy) +! break; +! strncpy( buf, CurBuffy->path, sizeof(buf) ); +! } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) + break; + if (!buf[0]) + { +*************** +*** 1066,1071 **** +--- 1076,1082 ---- + } + + mutt_expand_path (buf, sizeof (buf)); ++ set_curbuffy(buf); + if (mx_get_magic (buf) <= 0) + { + mutt_error (_("%s is not a mailbox."), buf); +*************** +*** 2092,2097 **** +--- 2103,2114 ---- + mutt_what_key(); + break; + ++ case OP_SIDEBAR_SCROLL_UP: ++ case OP_SIDEBAR_SCROLL_DOWN: ++ case OP_SIDEBAR_NEXT: ++ case OP_SIDEBAR_PREV: ++ scroll_sidebar(op, menu->menu); ++ break; + default: + if (menu->menu == MENU_MAIN) + km_error_key (MENU_MAIN); +diff -N -c -r mutt-1.5.9i-orig/flags.c mutt-1.5.9i-patched/flags.c +*** mutt-1.5.9i-orig/flags.c 2005-02-03 13:47:52.000000000 -0500 +--- mutt-1.5.9i-patched/flags.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 22,29 **** +--- 22,31 ---- + + #include "mutt.h" + #include "mutt_curses.h" ++ #include "mutt_menu.h" + #include "sort.h" + #include "mx.h" ++ #include "sidebar.h" + + #ifdef USE_IMAP + #include "imap_private.h" +*************** +*** 274,279 **** +--- 276,282 ---- + */ + if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged)) + h->searched = 0; ++ draw_sidebar(0); + } + + void mutt_tag_set_flag (int flag, int bf) +diff -N -c -r mutt-1.5.9i-orig/functions.h mutt-1.5.9i-patched/functions.h +*** mutt-1.5.9i-orig/functions.h 2005-02-19 08:49:39.000000000 -0500 +--- mutt-1.5.9i-patched/functions.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 149,154 **** +--- 149,159 ---- + { "decrypt-save", OP_DECRYPT_SAVE, NULL }, + + ++ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL }, ++ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL }, ++ { "sidebar-next", OP_SIDEBAR_NEXT, NULL }, ++ { "sidebar-prev", OP_SIDEBAR_PREV, NULL }, ++ { "sidebar-open", OP_SIDEBAR_OPEN, NULL }, + { NULL, 0, NULL } + }; + +*************** +*** 243,248 **** +--- 248,258 ---- + { "decrypt-save", OP_DECRYPT_SAVE, NULL }, + + ++ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL }, ++ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL }, ++ { "sidebar-next", OP_SIDEBAR_NEXT, NULL }, ++ { "sidebar-prev", OP_SIDEBAR_PREV, NULL }, ++ { "sidebar-open", OP_SIDEBAR_OPEN, NULL }, + { NULL, 0, NULL } + }; + +diff -N -c -r mutt-1.5.9i-orig/globals.h mutt-1.5.9i-patched/globals.h +*** mutt-1.5.9i-orig/globals.h 2005-02-12 15:01:02.000000000 -0500 +--- mutt-1.5.9i-patched/globals.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 179,184 **** +--- 179,187 ---- + WHERE short ScoreThresholdRead; + WHERE short ScoreThresholdFlag; + ++ WHERE struct buffy_t *CurBuffy INITVAL(0); ++ WHERE short DrawFullLine INITVAL(0); ++ WHERE short SidebarWidth; + #ifdef USE_IMAP + WHERE short ImapKeepalive; + #endif +diff -N -c -r mutt-1.5.9i-orig/init.h mutt-1.5.9i-patched/init.h +*** mutt-1.5.9i-orig/init.h 2005-03-01 10:56:02.000000000 -0500 +--- mutt-1.5.9i-patched/init.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 1078,1083 **** +--- 1078,1093 ---- + ** This specifies the folder into which read mail in your ``$$spoolfile'' + ** folder will be appended. + */ ++ { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 }, ++ /* ++ ** .pp ++ ** This specifies whether or not to show sidebar (left-side list of folders). ++ */ ++ { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 }, ++ /* ++ ** .pp ++ ** The width of the sidebar. ++ */ + { "mbox_type", DT_MAGIC,R_NONE, UL &DefaultMagic, M_MBOX }, + /* + ** .pp +diff -N -c -r mutt-1.5.9i-orig/mailbox.h mutt-1.5.9i-patched/mailbox.h +*** mutt-1.5.9i-orig/mailbox.h 2002-11-12 02:53:09.000000000 -0500 +--- mutt-1.5.9i-patched/mailbox.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 27,32 **** +--- 27,33 ---- + #define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses + * safe_fopen() for mbox-style folders. + */ ++ #define M_PEEK (1<<5) /* revert atime back after taking a look (if applicable) */ + + /* mx_open_new_message() */ + #define M_ADD_FROM 1 /* add a From_ line */ +diff -N -c -r mutt-1.5.9i-orig/Makefile.in mutt-1.5.9i-patched/Makefile.in +*** mutt-1.5.9i-orig/Makefile.in 2005-03-13 11:37:46.000000000 -0500 +--- mutt-1.5.9i-patched/Makefile.in 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 94,100 **** + history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ + editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \ + wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \ +! mutt_idna.$(OBJEXT) crypt-mod.$(OBJEXT) + mutt_OBJECTS = $(am_mutt_OBJECTS) + am__DEPENDENCIES_1 = + am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT) +--- 94,101 ---- + history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ + editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \ + wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \ +! mutt_idna.$(OBJEXT) crypt-mod.$(OBJEXT) \ +! sidebar.$(OBJEXT) + mutt_OBJECTS = $(am_mutt_OBJECTS) + am__DEPENDENCIES_1 = + am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT) +*************** +*** 304,310 **** + score.c send.c sendlib.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ + muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \ +! url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h + + mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ + $(INTLLIBS) $(LIBICONV) $(LIBGPGME_LIBS) +--- 305,312 ---- + score.c send.c sendlib.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ + muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \ +! url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h \ +! sidebar.c + + mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ + $(INTLLIBS) $(LIBICONV) $(LIBGPGME_LIBS) +*************** +*** 337,343 **** + makedoc.c stamp-doc-rc README.SSL smime.h\ + muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ + ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ +! snprintf.c regex.c crypt-gpgme.h + + EXTRA_SCRIPTS = smime_keys + mutt_dotlock_SOURCES = mutt_dotlock.c +--- 339,345 ---- + makedoc.c stamp-doc-rc README.SSL smime.h\ + muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ + ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ +! snprintf.c regex.c crypt-gpgme.h sidebar.h + + EXTRA_SCRIPTS = smime_keys + mutt_dotlock_SOURCES = mutt_dotlock.c +diff -N -c -r mutt-1.5.9i-orig/mbox.c mutt-1.5.9i-patched/mbox.c +*** mutt-1.5.9i-orig/mbox.c 2005-02-03 13:47:53.000000000 -0500 +--- mutt-1.5.9i-patched/mbox.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 97,102 **** +--- 97,103 ---- + mutt_perror (ctx->path); + return (-1); + } ++ ctx->atime = sb.st_atime; + ctx->mtime = sb.st_mtime; + ctx->size = sb.st_size; + +*************** +*** 245,250 **** +--- 246,252 ---- + + ctx->size = sb.st_size; + ctx->mtime = sb.st_mtime; ++ ctx->atime = sb.st_atime; + + #ifdef NFS_ATTRIBUTE_HACK + if (sb.st_mtime > sb.st_atime) +diff -N -c -r mutt-1.5.9i-orig/menu.c mutt-1.5.9i-patched/menu.c +*** mutt-1.5.9i-orig/menu.c 2005-02-28 10:13:57.000000000 -0500 +--- mutt-1.5.9i-patched/menu.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 24,29 **** +--- 24,30 ---- + #include "mutt_curses.h" + #include "mutt_menu.h" + #include "mbyte.h" ++ #include "sidebar.h" + + #ifdef USE_IMAP + #include "imap.h" +*************** +*** 157,163 **** + void menu_pad_string (char *s, size_t n) + { + int shift = option (OPTARROWCURSOR) ? 3 : 0; +! int cols = COLS - shift; + + mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1); + s[n - 1] = 0; +--- 158,164 ---- + void menu_pad_string (char *s, size_t n) + { + int shift = option (OPTARROWCURSOR) ? 3 : 0; +! int cols = COLS - shift - SidebarWidth; + + mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1); + s[n - 1] = 0; +*************** +*** 207,212 **** +--- 208,214 ---- + char buf[STRING]; + int i; + ++ draw_sidebar(1); + for (i = menu->top; i < menu->top + menu->pagelen; i++) + { + if (i < menu->max) +*************** +*** 217,223 **** + if (option (OPTARROWCURSOR)) + { + attrset (menu->color (i)); +! CLEARLINE (i - menu->top + menu->offset); + + if (i == menu->current) + { +--- 219,225 ---- + if (option (OPTARROWCURSOR)) + { + attrset (menu->color (i)); +! CLEARLINE_WIN (i - menu->top + menu->offset); + + if (i == menu->current) + { +*************** +*** 228,234 **** + addch (' '); + } + else +! move (i - menu->top + menu->offset, 3); + + print_enriched_string (menu->color(i), (unsigned char *) buf, 1); + SETCOLOR (MT_COLOR_NORMAL); +--- 230,236 ---- + addch (' '); + } + else +! move (i - menu->top + menu->offset, SidebarWidth + 3); + + print_enriched_string (menu->color(i), (unsigned char *) buf, 1); + SETCOLOR (MT_COLOR_NORMAL); +*************** +*** 243,256 **** + BKGDSET (MT_COLOR_INDICATOR); + } + +! CLEARLINE (i - menu->top + menu->offset); + print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current); + SETCOLOR (MT_COLOR_NORMAL); + BKGDSET (MT_COLOR_NORMAL); + } + } + else +! CLEARLINE (i - menu->top + menu->offset); + } + menu->redraw = 0; + } +--- 245,258 ---- + BKGDSET (MT_COLOR_INDICATOR); + } + +! CLEARLINE_WIN (i - menu->top + menu->offset); + print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current); + SETCOLOR (MT_COLOR_NORMAL); + BKGDSET (MT_COLOR_NORMAL); + } + } + else +! CLEARLINE_WIN (i - menu->top + menu->offset); + } + menu->redraw = 0; + } +*************** +*** 265,271 **** + return; + } + +! move (menu->oldcurrent + menu->offset - menu->top, 0); + SETCOLOR (MT_COLOR_NORMAL); + BKGDSET (MT_COLOR_NORMAL); + +--- 267,273 ---- + return; + } + +! move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth); + SETCOLOR (MT_COLOR_NORMAL); + BKGDSET (MT_COLOR_NORMAL); + +*************** +*** 280,292 **** + clrtoeol (); + menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent); + menu_pad_string (buf, sizeof (buf)); +! move (menu->oldcurrent + menu->offset - menu->top, 3); + print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1); + SETCOLOR (MT_COLOR_NORMAL); + } + + /* now draw it in the new location */ +! move (menu->current + menu->offset - menu->top, 0); + attrset (menu->color (menu->current)); + ADDCOLOR (MT_COLOR_INDICATOR); + addstr ("->"); +--- 282,294 ---- + clrtoeol (); + menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent); + menu_pad_string (buf, sizeof (buf)); +! move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3); + print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1); + SETCOLOR (MT_COLOR_NORMAL); + } + + /* now draw it in the new location */ +! move (menu->current + menu->offset - menu->top, SidebarWidth); + attrset (menu->color (menu->current)); + ADDCOLOR (MT_COLOR_INDICATOR); + addstr ("->"); +*************** +*** 307,313 **** + attrset (menu->color (menu->current)); + ADDCOLOR (MT_COLOR_INDICATOR); + BKGDSET (MT_COLOR_INDICATOR); +! CLEARLINE (menu->current - menu->top + menu->offset); + print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0); + SETCOLOR (MT_COLOR_NORMAL); + BKGDSET (MT_COLOR_NORMAL); +--- 309,315 ---- + attrset (menu->color (menu->current)); + ADDCOLOR (MT_COLOR_INDICATOR); + BKGDSET (MT_COLOR_INDICATOR); +! CLEARLINE_WIN (menu->current - menu->top + menu->offset); + print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0); + SETCOLOR (MT_COLOR_NORMAL); + BKGDSET (MT_COLOR_NORMAL); +*************** +*** 319,325 **** + { + char buf[STRING]; + +! move (menu->current + menu->offset - menu->top, 0); + menu_make_entry (buf, sizeof (buf), menu, menu->current); + menu_pad_string (buf, sizeof (buf)); + +--- 321,327 ---- + { + char buf[STRING]; + +! move (menu->current + menu->offset - menu->top, SidebarWidth); + menu_make_entry (buf, sizeof (buf), menu, menu->current); + menu_pad_string (buf, sizeof (buf)); + +diff -N -c -r mutt-1.5.9i-orig/mutt_curses.h mutt-1.5.9i-patched/mutt_curses.h +*** mutt-1.5.9i-orig/mutt_curses.h 2004-06-17 16:33:04.000000000 -0400 +--- mutt-1.5.9i-patched/mutt_curses.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 59,64 **** +--- 59,65 ---- + #undef lines + #endif /* lines */ + ++ #define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol() + #define CLEARLINE(x) move(x,0), clrtoeol() + #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x) + #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0) +*************** +*** 121,126 **** +--- 122,128 ---- + MT_COLOR_BOLD, + MT_COLOR_UNDERLINE, + MT_COLOR_INDEX, ++ MT_COLOR_NEW, + MT_COLOR_MAX + }; + +diff -N -c -r mutt-1.5.9i-orig/mutt.h mutt-1.5.9i-patched/mutt.h +*** mutt-1.5.9i-orig/mutt.h 2005-02-28 10:13:57.000000000 -0500 +--- mutt-1.5.9i-patched/mutt.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 415,420 **** +--- 415,421 ---- + OPTSAVEEMPTY, + OPTSAVENAME, + OPTSCORE, ++ OPTSIDEBAR, + OPTSIGDASHES, + OPTSIGONTOP, + OPTSORTRE, +*************** +*** 799,804 **** +--- 800,806 ---- + { + char *path; + FILE *fp; ++ time_t atime; + time_t mtime; + time_t mtime_cur; /* used with maildir folders */ + off_t size; +*************** +*** 834,839 **** +--- 836,842 ---- + unsigned int quiet : 1; /* inhibit status messages? */ + unsigned int collapsed : 1; /* are all threads collapsed? */ + unsigned int closing : 1; /* mailbox is being closed */ ++ unsigned int peekonly : 1; /* just taking a glance, revert atime */ + } CONTEXT; + + typedef struct attachptr +diff -N -c -r mutt-1.5.9i-orig/muttlib.c mutt-1.5.9i-patched/muttlib.c +*** mutt-1.5.9i-orig/muttlib.c 2005-02-12 14:30:16.000000000 -0500 +--- mutt-1.5.9i-patched/muttlib.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 1020,1026 **** + ch = *src++; /* pad char */ + /* calculate space left on line. if we've already written more data + than will fit on the line, ignore the rest of the line */ +! count = (COLS < destlen ? COLS : destlen); + if (count > col) + { + count -= col; /* how many columns left on this line */ +--- 1020,1029 ---- + ch = *src++; /* pad char */ + /* calculate space left on line. if we've already written more data + than will fit on the line, ignore the rest of the line */ +! if ( DrawFullLine ) +! count = (COLS < destlen ? COLS : destlen); +! else +! count = ((COLS-SidebarWidth) < destlen ? COLS - SidebarWidth : destlen); + if (count > col) + { + count -= col; /* how many columns left on this line */ +diff -N -c -r mutt-1.5.9i-orig/Muttrc mutt-1.5.9i-patched/Muttrc +*** mutt-1.5.9i-orig/Muttrc 2005-03-13 11:37:11.000000000 -0500 +--- mutt-1.5.9i-patched/Muttrc 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 1770,1775 **** +--- 1770,1795 ---- + # function. + # + # ++ # set sidebar_visible=no ++ # ++ # Name: sidebar_visible ++ # Type: boolean ++ # Default: no ++ # ++ # ++ # This specifies whether or not to show sidebar (left-side list of folders). ++ # ++ # ++ # set sidebar_width=0 ++ # ++ # Name: sidebar_width ++ # Type: number ++ # Default: 0 ++ # ++ # ++ # The width of the sidebar. ++ # ++ # + # set crypt_autosign=no + # + # Name: crypt_autosign +diff -N -c -r mutt-1.5.9i-orig/mx.c mutt-1.5.9i-patched/mx.c +*** mutt-1.5.9i-orig/mx.c 2005-02-03 13:47:53.000000000 -0500 +--- mutt-1.5.9i-patched/mx.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 620,625 **** +--- 620,626 ---- + * M_APPEND open mailbox for appending + * M_READONLY open mailbox in read-only mode + * M_QUIET only print error messages ++ * M_PEEK revert atime where applicable + * ctx if non-null, context struct to use + */ + CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx) +*************** +*** 639,644 **** +--- 640,647 ---- + ctx->quiet = 1; + if (flags & M_READONLY) + ctx->readonly = 1; ++ if (flags & M_PEEK) ++ ctx->peekonly = 1; + + if (flags & (M_APPEND|M_NEWFOLDER)) + { +*************** +*** 738,746 **** +--- 741,761 ---- + void mx_fastclose_mailbox (CONTEXT *ctx) + { + int i; ++ #ifndef BUFFY_SIZE ++ struct utimbuf ut; ++ #endif + + if(!ctx) + return; ++ #ifndef BUFFY_SIZE ++ /* fix up the times so buffy won't get confused */ ++ if (ctx->peekonly && ctx->path && ctx->mtime > ctx->atime) ++ { ++ ut.actime = ctx->atime; ++ ut.modtime = ctx->mtime; ++ utime (ctx->path, &ut); ++ } ++ #endif + + #ifdef USE_IMAP + if (ctx->magic == M_IMAP) +diff -N -c -r mutt-1.5.9i-orig/OPS mutt-1.5.9i-patched/OPS +*** mutt-1.5.9i-orig/OPS 2005-02-19 08:49:37.000000000 -0500 +--- mutt-1.5.9i-patched/OPS 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 175,177 **** +--- 175,182 ---- + OP_MAIN_SHOW_LIMIT "show currently active limit pattern" + OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread" + OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads" ++ OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page" ++ OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page" ++ OP_SIDEBAR_NEXT "go down to next mailbox" ++ OP_SIDEBAR_PREV "go to previous mailbox" ++ OP_SIDEBAR_OPEN "open hilighted mailbox" +diff -N -c -r mutt-1.5.9i-orig/pager.c mutt-1.5.9i-patched/pager.c +*** mutt-1.5.9i-orig/pager.c 2005-02-12 14:30:16.000000000 -0500 +--- mutt-1.5.9i-patched/pager.c 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 30,35 **** +--- 30,36 ---- + #include "pager.h" + #include "attach.h" + #include "mbyte.h" ++ #include "sidebar.h" + + #include "mx.h" + +*************** +*** 1036,1042 **** + wchar_t wc; + mbstate_t mbstate; + +! int wrap_cols = COLS - WrapMargin; + + if (wrap_cols <= 0) + wrap_cols = COLS; +--- 1037,1043 ---- + wchar_t wc; + mbstate_t mbstate; + +! int wrap_cols = COLS - WrapMargin - SidebarWidth; + + if (wrap_cols <= 0) + wrap_cols = COLS; +*************** +*** 1669,1675 **** + if ((redraw & REDRAW_BODY) || topline != oldtopline) + { + do { +! move (bodyoffset, 0); + curline = oldtopline = topline; + lines = 0; + force_redraw = 0; +--- 1670,1676 ---- + if ((redraw & REDRAW_BODY) || topline != oldtopline) + { + do { +! move (bodyoffset, SidebarWidth); + curline = oldtopline = topline; + lines = 0; + force_redraw = 0; +*************** +*** 1682,1687 **** +--- 1683,1689 ---- + &QuoteList, &q_level, &force_redraw, &SearchRE) > 0) + lines++; + curline++; ++ move(lines + bodyoffset, SidebarWidth); + } + last_offset = lineInfo[curline].offset; + } while (force_redraw); +*************** +*** 1695,1700 **** +--- 1697,1703 ---- + addch ('~'); + addch ('\n'); + lines++; ++ move(lines + bodyoffset, SidebarWidth); + } + /* We are going to update the pager status bar, so it isn't + * necessary to reset to normal color now. */ +*************** +*** 1707,1728 **** + /* print out the pager status bar */ + SETCOLOR (MT_COLOR_STATUS); + BKGDSET (MT_COLOR_STATUS); +! CLEARLINE (statusoffset); + if (IsHeader (extra)) + { +! size_t l1 = (COLS - 9) * MB_LEN_MAX; + size_t l2 = sizeof (buffer); + _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), + Context, extra->hdr, M_FORMAT_MAKEPRINT); + } + else if (IsMsgAttach (extra)) + { +! size_t l1 = (COLS - 9) * MB_LEN_MAX; + size_t l2 = sizeof (buffer); + _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), + Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT); + } +! mutt_paddstr (COLS-10, IsHeader (extra) || IsMsgAttach (extra) ? + buffer : banner); + addstr (" -- ("); + if (last_pos < sb.st_size - 1) +--- 1710,1731 ---- + /* print out the pager status bar */ + SETCOLOR (MT_COLOR_STATUS); + BKGDSET (MT_COLOR_STATUS); +! CLEARLINE_WIN(statusoffset); + if (IsHeader (extra)) + { +! size_t l1 = ((COLS - 9) * MB_LEN_MAX) - (SidebarWidth * MB_LEN_MAX); + size_t l2 = sizeof (buffer); + _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), + Context, extra->hdr, M_FORMAT_MAKEPRINT); + } + else if (IsMsgAttach (extra)) + { +! size_t l1 = (COLS - 9) * MB_LEN_MAX - (SidebarWidth * MB_LEN_MAX); + size_t l2 = sizeof (buffer); + _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), + Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT); + } +! mutt_paddstr (COLS-10-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ? + buffer : banner); + addstr (" -- ("); + if (last_pos < sb.st_size - 1) +*************** +*** 1738,1752 **** + /* redraw the pager_index indicator, because the + * flags for this message might have changed. */ + menu_redraw_current (index); +! + /* print out the index status bar */ + menu_status_line (buffer, sizeof (buffer), index, NONULL(Status)); +! +! move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0); + SETCOLOR (MT_COLOR_STATUS); +! mutt_paddstr (COLS, buffer); + SETCOLOR (MT_COLOR_NORMAL); + } + + redraw = 0; + +--- 1741,1758 ---- + /* redraw the pager_index indicator, because the + * flags for this message might have changed. */ + menu_redraw_current (index); +! draw_sidebar(MENU_PAGER); + /* print out the index status bar */ + menu_status_line (buffer, sizeof (buffer), index, NONULL(Status)); +! move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), +! SidebarWidth); + SETCOLOR (MT_COLOR_STATUS); +! mutt_paddstr (COLS-SidebarWidth, buffer); + SETCOLOR (MT_COLOR_NORMAL); + } ++ /* if we're not using the index, update every time */ ++ if ( index == 0 ) ++ draw_sidebar(MENU_PAGER); + + redraw = 0; + +*************** +*** 2624,2629 **** +--- 2630,2641 ---- + redraw = REDRAW_FULL; + break; + ++ case OP_SIDEBAR_SCROLL_UP: ++ case OP_SIDEBAR_SCROLL_DOWN: ++ case OP_SIDEBAR_NEXT: ++ case OP_SIDEBAR_PREV: ++ scroll_sidebar(ch, MENU_PAGER); ++ break; + default: + ch = -1; + break; +diff -N -c -r mutt-1.5.9i-orig/PATCHES mutt-1.5.9i-patched/PATCHES +*** mutt-1.5.9i-orig/PATCHES 2005-03-13 11:33:06.000000000 -0500 +--- mutt-1.5.9i-patched/PATCHES 2005-06-28 15:36:06.000000000 -0400 +*************** +*** 0 **** +--- 1 ---- ++ patch-1.5.9i.sidebar.20050628 +diff -N -c -r mutt-1.5.9i-orig/sidebar.c mutt-1.5.9i-patched/sidebar.c +*** mutt-1.5.9i-orig/sidebar.c 1969-12-31 19:00:00.000000000 -0500 +--- mutt-1.5.9i-patched/sidebar.c 2005-06-28 15:32:07.000000000 -0400 +*************** +*** 0 **** +--- 1,264 ---- ++ /* ++ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu> ++ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. ++ */ ++ ++ ++ #if HAVE_CONFIG_H ++ # include "config.h" ++ #endif ++ ++ #include "mutt.h" ++ #include "mutt_menu.h" ++ #include "mutt_curses.h" ++ #include "sidebar.h" ++ #include "buffy.h" ++ #include <libgen.h> ++ #include "keymap.h" ++ #include <stdbool.h> ++ ++ /*BUFFY *CurBuffy = 0;*/ ++ static BUFFY *TopBuffy = 0; ++ static BUFFY *BottomBuffy = 0; ++ static int known_lines = 0; ++ ++ static int quick_log10(int n) ++ { ++ char string[32]; ++ sprintf(string, "%d", n); ++ return strlen(string); ++ } ++ ++ void calc_boundaries (int menu) ++ { ++ BUFFY *tmp = Incoming; ++ ++ if ( known_lines != LINES ) { ++ TopBuffy = BottomBuffy = 0; ++ known_lines = LINES; ++ } ++ for ( ; tmp->next != 0; tmp = tmp->next ) ++ tmp->next->prev = tmp; ++ ++ if ( TopBuffy == 0 && BottomBuffy == 0 ) ++ TopBuffy = Incoming; ++ if ( BottomBuffy == 0 ) { ++ int count = LINES - 2 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); ++ BottomBuffy = TopBuffy; ++ while ( --count && BottomBuffy->next ) ++ BottomBuffy = BottomBuffy->next; ++ } ++ else if ( TopBuffy == CurBuffy->next ) { ++ int count = LINES - 2 - (menu != MENU_PAGER); ++ BottomBuffy = CurBuffy; ++ tmp = BottomBuffy; ++ while ( --count && tmp->prev) ++ tmp = tmp->prev; ++ TopBuffy = tmp; ++ } ++ else if ( BottomBuffy == CurBuffy->prev ) { ++ int count = LINES - 2 - (menu != MENU_PAGER); ++ TopBuffy = CurBuffy; ++ tmp = TopBuffy; ++ while ( --count && tmp->next ) ++ tmp = tmp->next; ++ BottomBuffy = tmp; ++ } ++ } ++ ++ char *make_sidebar_entry(char *box, int size, int new) ++ { ++ static char *entry = 0; ++ char *c; ++ int i = 0; ++ ++ c = realloc(entry, SidebarWidth + 1); ++ if ( c ) entry = c; ++ entry[SidebarWidth] = 0; ++ for (; i < SidebarWidth; entry[i++] = ' ' ); ++ i = strlen(box); ++ strncpy( entry, box, i < SidebarWidth ? i :SidebarWidth ); ++ ++ if ( new ) ++ sprintf( ++ entry + SidebarWidth - 5 - quick_log10(size) - quick_log10(new), ++ "% d(%d)", size, new); ++ else ++ sprintf( entry + SidebarWidth - 3 - quick_log10(size), "% d", size); ++ return entry; ++ } ++ ++ void set_curbuffy(char buf[LONG_STRING]) ++ { ++ BUFFY* tmp = CurBuffy = Incoming; ++ ++ if (!Incoming) ++ return; ++ ++ while(1) { ++ if(!strcmp(tmp->path, buf)) { ++ CurBuffy = tmp; ++ break; ++ } ++ ++ if(tmp->next) ++ tmp = tmp->next; ++ else ++ break; ++ } ++ } ++ ++ int draw_sidebar(int menu) { ++ ++ int lines = option(OPTHELP) ? 1 : 0; ++ BUFFY *tmp; ++ #ifndef USE_SLANG_CURSES ++ attr_t attrs; ++ #endif ++ short color_pair; ++ ++ static bool initialized = false; ++ static int prev_show_value; ++ static short saveSidebarWidth; ++ ++ /* initialize first time */ ++ if(!initialized) { ++ prev_show_value = option(OPTSIDEBAR); ++ saveSidebarWidth = SidebarWidth; ++ if(!option(OPTSIDEBAR)) SidebarWidth = 0; ++ initialized = true; ++ } ++ ++ /* save or restore the value SidebarWidth */ ++ if(prev_show_value != option(OPTSIDEBAR)) { ++ if(prev_show_value && !option(OPTSIDEBAR)) { ++ saveSidebarWidth = SidebarWidth; ++ SidebarWidth = 0; ++ } else if(!prev_show_value && option(OPTSIDEBAR)) { ++ SidebarWidth = saveSidebarWidth; ++ } ++ prev_show_value = option(OPTSIDEBAR); ++ } ++ ++ ++ if ( SidebarWidth == 0 ) return 0; ++ ++ /* get attributes for divider */ ++ SETCOLOR(MT_COLOR_STATUS); ++ #ifndef USE_SLANG_CURSES ++ attr_get(&attrs, &color_pair, 0); ++ #else ++ color_pair = attr_get(); ++ #endif ++ SETCOLOR(MT_COLOR_NORMAL); ++ ++ /* draw the divider */ ++ ++ for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) { ++ move(lines, SidebarWidth - 1); ++ addch('|'); ++ #ifndef USE_SLANG_CURSES ++ mvchgat(lines, SidebarWidth - 1, 1, 0, color_pair, NULL); ++ #endif ++ } ++ if ( Incoming == 0 ) return 0; ++ lines = option(OPTHELP) ? 1 : 0; /* go back to the top */ ++ ++ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) ++ calc_boundaries(menu); ++ if ( CurBuffy == 0 ) CurBuffy = Incoming; ++ ++ tmp = TopBuffy; ++ ++ SETCOLOR(MT_COLOR_NORMAL); ++ ++ for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) { ++ if ( tmp == CurBuffy ) ++ SETCOLOR(MT_COLOR_INDICATOR); ++ else if ( tmp->msg_unread > 0 ) ++ SETCOLOR(MT_COLOR_NEW); ++ else ++ SETCOLOR(MT_COLOR_NORMAL); ++ ++ move( lines, 0 ); ++ if ( Context && !strcmp( tmp->path, Context->path ) ) { ++ tmp->msg_unread = Context->unread; ++ tmp->msgcount = Context->msgcount; ++ } ++ printw( "%.*s", SidebarWidth, ++ make_sidebar_entry(basename(tmp->path), tmp->msgcount, ++ tmp->msg_unread)); ++ lines++; ++ } ++ SETCOLOR(MT_COLOR_NORMAL); ++ for ( ; lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) { ++ int i = 0; ++ move( lines, 0 ); ++ for ( ; i < SidebarWidth - 1; i++ ) ++ addch(' '); ++ } ++ return 0; ++ } ++ ++ ++ void set_buffystats(CONTEXT* Context) ++ { ++ BUFFY *tmp = Incoming; ++ while(tmp) { ++ if(Context && !strcmp(tmp->path, Context->path)) { ++ tmp->msg_unread = Context->unread; ++ tmp->msgcount = Context->msgcount; ++ break; ++ } ++ tmp = tmp->next; ++ } ++ } ++ ++ void scroll_sidebar(int op, int menu) ++ { ++ if(!SidebarWidth) return; ++ if(!CurBuffy) return; ++ ++ switch (op) { ++ case OP_SIDEBAR_NEXT: ++ if ( CurBuffy->next == NULL ) return; ++ CurBuffy = CurBuffy->next; ++ break; ++ case OP_SIDEBAR_PREV: ++ if ( CurBuffy->prev == NULL ) return; ++ CurBuffy = CurBuffy->prev; ++ break; ++ case OP_SIDEBAR_SCROLL_UP: ++ CurBuffy = TopBuffy; ++ if ( CurBuffy != Incoming ) { ++ calc_boundaries(menu); ++ CurBuffy = CurBuffy->prev; ++ } ++ break; ++ case OP_SIDEBAR_SCROLL_DOWN: ++ CurBuffy = BottomBuffy; ++ if ( CurBuffy->next ) { ++ calc_boundaries(menu); ++ CurBuffy = CurBuffy->next; ++ } ++ break; ++ default: ++ return; ++ } ++ calc_boundaries(menu); ++ draw_sidebar(menu); ++ } +diff -N -c -r mutt-1.5.9i-orig/sidebar.h mutt-1.5.9i-patched/sidebar.h +*** mutt-1.5.9i-orig/sidebar.h 1969-12-31 19:00:00.000000000 -0500 +--- mutt-1.5.9i-patched/sidebar.h 2005-05-25 14:53:34.000000000 -0400 +*************** +*** 0 **** +--- 1,36 ---- ++ /* ++ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu> ++ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. ++ */ ++ ++ #ifndef SIDEBAR_H ++ #define SIDEBAR_H ++ ++ struct MBOX_LIST { ++ char *path; ++ int msgcount; ++ int new; ++ } MBLIST; ++ ++ /* parameter is whether or not to go to the status line */ ++ /* used for omitting the last | that covers up the status bar in the index */ ++ int draw_sidebar(int); ++ void scroll_sidebar(int, int); ++ void set_curbuffy(char*); ++ void set_buffystats(CONTEXT*); ++ ++ #endif /* SIDEBAR_H */ diff --git a/packages/mutt/mutt-1.5.9i/posix1_lim.patch b/packages/mutt/mutt-1.5.9i/posix1_lim.patch new file mode 100644 index 0000000000..8381174cc3 --- /dev/null +++ b/packages/mutt/mutt-1.5.9i/posix1_lim.patch @@ -0,0 +1,49 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- mutt-1.5.4/mutt_dotlock.c~posix1_lim ++++ mutt-1.5.4/mutt_dotlock.c +@@ -39,7 +39,7 @@ + #include <limits.h> + + #ifndef _POSIX_PATH_MAX +-#include <posix1_lim.h> ++#include <bits/posix1_lim.h> + #endif + + #include "dotlock.h" +--- mutt-1.5.4/mutt.h~posix1_lim ++++ mutt-1.5.4/mutt.h +@@ -43,7 +43,7 @@ + #endif + + #ifndef _POSIX_PATH_MAX +-#include <posix1_lim.h> ++#include <bits/posix1_lim.h> + #endif + + #include <pwd.h> +--- mutt-1.5.4/dotlock.c~posix1_lim ++++ mutt-1.5.4/dotlock.c +@@ -39,7 +39,7 @@ + #include <limits.h> + + #ifndef _POSIX_PATH_MAX +-#include <posix1_lim.h> ++#include <bits/posix1_lim.h> + #endif + + #include "dotlock.h" +--- mutt-1.5.4/lib.h~posix1_lim ++++ mutt-1.5.4/lib.h +@@ -40,7 +40,7 @@ + # include <signal.h> + + # ifndef _POSIX_PATH_MAX +-# include <posix1_lim.h> ++# include <bits/posix1_lim.h> + # endif + + # ifdef ENABLE_NLS diff --git a/packages/mutt/mutt-1.5.9i/sidebar-nntp-clash.patch b/packages/mutt/mutt-1.5.9i/sidebar-nntp-clash.patch new file mode 100644 index 0000000000..c180f1861f --- /dev/null +++ b/packages/mutt/mutt-1.5.9i/sidebar-nntp-clash.patch @@ -0,0 +1,63 @@ +--- mutt-1.5.9/compose.c.orig 2005-08-04 10:58:39.282202360 +0000 ++++ mutt-1.5.9/compose.c 2005-08-04 11:02:58.420807304 +0000 +@@ -146,16 +146,16 @@ + if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) + { + if (!msg->security) +- mvaddstr (HDR_CRYPT, 0, " Security: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " Security: "); + else if (msg->security & APPLICATION_SMIME) +- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); + else if (msg->security & APPLICATION_PGP) +- mvaddstr (HDR_CRYPT, 0, " PGP: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); + } + else if ((WithCrypto & APPLICATION_SMIME)) +- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); + else if ((WithCrypto & APPLICATION_PGP)) +- mvaddstr (HDR_CRYPT, 0, " PGP: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); + else + return; + +@@ -294,21 +294,21 @@ + } + else + { +- mvprintw (HDR_TO, 0, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]); ++ mvprintw (HDR_TO, SidebarWidth, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]); + mutt_paddstr (W, NONULL (msg->env->newsgroups)); +- mvprintw (HDR_CC, 0, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]); ++ mvprintw (HDR_CC, SidebarWidth, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]); + mutt_paddstr (W, NONULL (msg->env->followup_to)); + if (option (OPTXCOMMENTTO)) + { +- mvprintw (HDR_BCC, 0, TITLE_FMT , Prompts[HDR_XCOMMENTTO - 1]); ++ mvprintw (HDR_BCC, SidebarWidth, TITLE_FMT , Prompts[HDR_XCOMMENTTO - 1]); + mutt_paddstr (W, NONULL (msg->env->x_comment_to)); + } + } + #endif +- mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); ++ mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); + mutt_paddstr (W, NONULL (msg->env->subject)); + draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); +- mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]); ++ mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]); + mutt_paddstr (W, fcc); + + if (WithCrypto) +--- mutt-1.5.9/Makefile.am.orig 2005-08-04 11:22:12.390377264 +0000 ++++ mutt-1.5.9/Makefile.am 2005-08-04 11:22:29.806729576 +0000 +@@ -28,7 +28,8 @@ + score.c send.c sendlib.c signal.c sort.c \ + status.c system.c thread.c charset.c history.c lib.c \ + muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \ +- url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h ++ url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h \ ++ sidebar.c + + mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ + $(INTLLIBS) $(LIBICONV) $(LIBGPGME_LIBS) diff --git a/packages/mutt/mutt_1.5.9i.bb b/packages/mutt/mutt_1.5.9i.bb new file mode 100644 index 0000000000..c6939454d2 --- /dev/null +++ b/packages/mutt/mutt_1.5.9i.bb @@ -0,0 +1,32 @@ +SECTION = "console/network" +DEPENDS = "ncurses gnutls gpgme" +DESCRIPTION = "Mutt is a small but very powerful text-based \ +MIME mail client. It is highly configurable, and is well-suited \ +to the mail power user with advanced features like key \ +bindings, keyboard macros, mail threading, regular expression \ +searches, and a powerful pattern matching language for selecting \ +groups of messages." +LICENSE = "GPL" +SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \ + http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz;patch=1 \ + http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz;patch=1 \ + http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.initials.gz;patch=1 \ + http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.quote.gz;patch=1 \ + file://patch-1.5.9i.sidebar.20050628.txt.hackedfornntp;patch=1 \ + file://sidebar-nntp-clash.patch;patch=1 \ + file://cppflags.patch;patch=1 \ + file://posix1_lim.patch;patch=1 \ + file://makedoc.patch;patch=1 " +# file://configure.patch;patch=1" +S = "${WORKDIR}/mutt-1.5.9" + +DEFAULT_PREFERENCE = -1 + +inherit autotools + +EXTRA_OECONF = "--enable-gpgme --with-curses=${STAGING_LIBDIR}/.. \ + --enable-pop --enable-imap --with-gnutls --enable-compressed --enable-nntp" + +do_compile_prepend () { + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} makedoc.c -o makedoc +} diff --git a/packages/netpbm/.mtn2git_empty b/packages/netpbm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netpbm/.mtn2git_empty diff --git a/packages/netpbm/files/.mtn2git_empty b/packages/netpbm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netpbm/files/.mtn2git_empty diff --git a/packages/netpbm/files/oeendiangen b/packages/netpbm/files/oeendiangen new file mode 100644 index 0000000000..b01e5e855b --- /dev/null +++ b/packages/netpbm/files/oeendiangen @@ -0,0 +1,30 @@ +#!/bin/sh +# +# This replaces 'endiangen' for OpenEmbedded. OE builds can rely on +# the GNU endian.h, however this generates __ names, (unless __USE_BSD +# is set) so we need to deal with this. Match the output of endiangen. +cat <<EOF +#ifndef OE_ENDIAN_H +#define OE_ENDIAN_H 1 +#include <ctype.h> +#include <endian.h> + +#ifndef LITTLE_ENDIAN +# define LITTLE_ENDIAN __LITTLE_ENDIAN +#endif +#ifndef BIG_ENDIAN +# define BIG_ENDIAN __BIG_ENDIAN +#endif +#ifndef PDP_ENDIAN +# define PDP_ENDIAN __PDP_ENDIAN +#endif +#ifndef BYTE_ORDER +# define BYTE_ORDER __BYTE_ORDER +#endif + +#ifndef BITS_PER_WORD +# include <bits/wordsize.h> +# define BITS_PER_WORD __WORDSIZE +#endif +#endif +EOF diff --git a/packages/netpbm/netpbm-10.28/.mtn2git_empty b/packages/netpbm/netpbm-10.28/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netpbm/netpbm-10.28/.mtn2git_empty diff --git a/packages/netpbm/netpbm-10.28/Makefile.config b/packages/netpbm/netpbm-10.28/Makefile.config new file mode 100644 index 0000000000..3407fcfd18 --- /dev/null +++ b/packages/netpbm/netpbm-10.28/Makefile.config @@ -0,0 +1,380 @@ +# This is the configuration file for OpenEmbedded +# It is a generic file for *all* architectures supported by +# OpenEmbedded. +# +# This is a make file inclusion, to be included in all the Netpbm make +# files. + +# This file is meant to contain variable settings that customize the +# build for a particular target system configuration. + +# The distribution contains the file Makefile.config.in. You edit +# Makefile.config.in in ways relevant to your particular environment +# to create Makefile.config. The "configure" program will do this +# for you in simple cases. + +# Some of the variables that the including make file must set for this +# file to work: +# +# SRCDIR: The directory at the top of the Netpbm source tree. Note that +# this is typically a relative directory, and it must be relative to the +# make file that includes this file. + +DEFAULT_TARGET = merge + +# Fiasco has some special requirements that make it fail to compile on +# some systems, and since it isn't very important, just set this to "N" +# and skip it on those systems unless you want to debug it and fix it. +# OpenBSD: +#BUILD_FIASCO = N +BUILD_FIASCO = Y + +# The following are commands for the build process to use. These values +# do not get built into anything. + +# The C compiler (including macro preprocessor) +#CC = gcc + +# The linker. +LD = $(CC) + +#If the linker identified above is a compiler that invokes a linker +#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is +#that we expect a compiler to take linker options in the '-Wl,-opt1,val1' +#syntax whereas the actual linker would take '-opt1 val1'. +LINKERISCOMPILER=Y + +#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can +#take a library as just another link object argument, as in 'ld +#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a +#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'. +#This variable controls how 'libopt' gets built. Note that with some +#linkers, you can specify a shared library explicitly, but then it has +#to live in that exact place at run time. That's not good enough for us. +LINKER_CAN_DO_EXPLICIT_LIBRARY=Y + +# This is the name of the header file that declares the types +# uint32_t, etc. This name is used as #include $(INTTYPES_H) . +# Set to null if the types come automatically without including anything. +INTTYPES_H = <inttypes.h> + +# HAVE_INT64 tells whether, assuming you include the header indicated by +# INTTYPES_H, you have the int64_t type and related stuff. (If you don't +# the build will omit certain code that does 64 bit computations). +HAVE_INT64 = Y + +# CC and LD are for building the Netpbm programs, which are not necessarily +# intended to run on the same system on which Make is running. But when we +# build a build tool such as Libopt, it is meant to run only on the same +# system on which the Make is running. The variables below define programs +# to use to compile and link build tools. +CC_FOR_BUILD = $(BUILD_CC) +LD_FOR_BUILD = $(BUILD_CC) + +# MAKE is set automatically by Make to what was used to invoke Make. + +INSTALL = install + +# STRIPFLAG is the option you pass to the above install program to make it +# strip unnecessary information out of binaries. +STRIPFLAG = -s + +SYMLINK = ln -s + +#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the +#pointer man pages are installed (ready to nroff, or ready to cat). +#A pointer man pages is just a single-paragraph pages that tells you there is +#no man page for the program, to look at the HTML documentation instead. +MANPAGE_FORMAT = nroff + +LEX = flex + +# EXE is a suffix that the linker puts on any executable it generates. +# In cygwin, this is .exe and most programs deal with its existence without +# us having to know about it. Some don't though, so set this: +EXE = + +# linker options. + +# Linker options for created Netpbm shared libraries. + +# Here, $(SONAME) resolves to the soname for the shared library being created. +# The following are gcc options. This works on GNU libc systems. +LDSHLIB = -shared -fpic -Wl,-soname,$(SONAME) + +# LDRELOC is the command to combine two .o files (relocateable object files) +# into a single .o file that can later be linked into something else. NONE +# means no such command is available. +LDRELOC = $(TARGET_LD) --reloc + +# On older systems, you have to make shared libraries out of position +# independent code, so you need -fpic or fPIC here. (The rule is: if +# -fpic works, use it. If it bombs, go to fPIC). On newer systems, +# it isn't necessary, but can save real memory at the expense of +# execution speed. Without position independent code, the library +# loader may have to patch addresses into the executable text. On an +# older system, this would cause a program crash because the loader +# would be writing into read-only shared memory. But on newer +# systems, the system silently creates a private mapping of the page +# or segment being modified (the "copy on write" phenomenon). So it +# needs its own private real page frame. In one experiment, A second +# copy of Pbmtext used 16K less real memory when built with -fpic than +# when built without. 2001.06.02. + +# We have seen -fPIC required on IA64 and AMD64 machines (GNU +# compiler/linker). Build-time linking fails without it. I don't +# know why -- history seems to be repeating itself. 2005.02.23. + +CFLAGS_SHLIB = -fpic + +# SHLIB_CLIB is the link option to include the C library in a shared library, +# normally "-lc". On typical systems, this serves no purpose. On some, +# though, it causes information about which C library to use to be recorded +# in the shared library and thus choose the correct library among several or +# avoid using an incompatible one. But on some systems, the link fails. +# On 2002.09.30, "John H. DuBois III" <spcecdt@armory.com> reports that on +# SCO OpenServer, he gets the following error message with -lc: +# +# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o); +# fatal error: relocations remain against allocatable but non-writable +# section: ; .text + +SHLIB_CLIB = + +# On some systems you have to build into an executable the list of +# directories where its dynamically linked libraries can be found at +# run time. This is typically done with a -R or -rpath linker +# option. Even on systems that don't require it, you might prefer to do +# that rather than set up environment variables or configuration files +# to tell the system where the libraries are. A "Y" here means to put +# the directory information in the executable at link time. +NEED_RUNTIME_PATH = Y + +# RPATHOPTNAME is the option you use on the link command to specify +# a runtime search path for a shared library. It is meaningless unless +# NEED_RUNTIME_PATH is Y. +RPATHOPTNAME = -rpath + +# The following variables tell where your various libraries on which +# Netpbm depends live. The LIBxxx variable is a full file +# specification of the link library (not necessarily the library used +# at run time). e.g. "/usr/local/lib/graphics/libpng.so". It usually +# doesn't matter if the library prefix and suffix are right -- you can +# use "lib" and ".so" or ".a" regardless of what your system actually +# uses because these just turn into "-L" and "-l" linker options +# anyway. ".a" implies a static library for some purposes, though. +# If you don't have the library in question, use a value of NONE for +# LIBxxx and the build will simply skip the programs that require that +# library. If the library is in your linker's (or the Netpbm build's) +# default search path, leave off the directory part, e.g. "libpng.so". + +# The xxxHDR_DIR variable is the directory in which the interface +# headers for the library live (e.g. /usr/include). If they are in your +# compiler's default search path, set this variable to null. + +# This is where the Netpbm shared libraries will reside when Netpbm is +# fully installed. In some configurations, the Netpbm builder builds +# this information into the Netpbm executables. This does NOT affect +# where the Netpbm installer installs the libraries. A null value +# means the libraries are in a default search path used by the runtime +# library loader. +NETPBMLIB_RUNTIME_PATH = $(libdir) +#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm + +# The TIFF library. See above. If you want to build the tiff +# converters, you must have the tiff library already installed. + +TIFFLIB = libtiff.so +TIFFHDR_DIR = + +# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any +# program linked with the TIFF library needs a Jpeg and/or Z library. +# Some TIFF libraries have such library statically linked in, but others +# need it to be dynamically linked at program load time. +# Make this 'N' if youf TIFF library doesn't need such dynamic linking. +# As of 2005.01, the most usual build of the TIFF library appears to require +# both. +TIFFLIB_NEEDS_JPEG = Y +TIFFLIB_NEEDS_Z = Y + +# The JPEG library. See above. If you want to build the jpeg +# converters you must have the jpeg library already installed. + +# Tiff files can use JPEG compression, so the Tiff library can reference +# the JPEG library. If your Tiff library references a dynamic JPEG +# library, you must specify at least JPEGLIB here, or the Tiff +# converters will not build. Note that your Tiff library may have the +# JPEG stuff statically linked in, in which case you won't need +# JPEGLIB in order to build the Tiff converters. + +JPEGLIB = libjpeg.so +JPEGHDR_DIR = + +# The PNG library. See above. If you want to build the PNG +# converters you must have the PNG library already installed. + +# The PNG library, by convention starting around April 2002, gets installed +# with names that include a version number, such as libpng10.a and header +# files in /usr/include/libpng10. +# option. +PNGLIB = libpng.so +PNGHDR_DIR = +PNGVER = + +# The zlib compression library. See above. You need it to build +# anything that needs the PNG library (see above). If you selected +# NONE for the PNG library, it doesn't matter what you specify here -- +# it won't get used. +ZLIB = libz.so +ZHDR_DIR = + +# The JBIG lossless image compression library (aka JBIG-KIT): +JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a +JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig + +# The Jasper JPEG-2000 image compression library (aka JasPer): +JASPERLIB = $(INTERNAL_JASPERLIB) +JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) +# JASPERDEPLIBS is the libraries (-l options or file names) on which +# The Jasper library depends -- i.e. what you have to link into any +# executable that links in the Jasper library. +JASPERDEPLIBS = +#JASPERDEPLIBS = -ljpeg + +# And the Utah Raster Toolkit (aka URT aka RLE) library: +URTLIB = $(BUILDDIR)/urt/librle.a +URTHDR_DIR = $(SRCDIR)/urt + +# The Linux SVGA library (Svgalib) is a facility for displaying graphics +# on the Linux console. It is required by Ppmsvgalib. +LINUXSVGALIB = NONE +LINUXSVGAHDR_DIR = + +# If you don't want any network functions, set OMIT_NETWORK to "y". +# The only thing that requires network functions is the option in +# ppmtompeg to run it on multiple computers simultaneously. On some +# systems network functions don't work or we haven't figured out how to +# make them work, or they just aren't worth the effort. +OMIT_NETWORK = + +# These are -l options to link in the network libraries. Often, these are +# built into the standard C library, so this can be null. This is irrelevant +# if OMIT_NETWORK is "y". +NETWORKLD = + +VMS = +#VMS: +#VMS = yes + +# The following variables are used only by 'make install' (and the +# variants of it). Paths here don't, for example, get built into any +# programs. + +# This is where everything goes when you do 'make package', unless you +# override it by setting 'pkgdir' on the Make command line. +PKGDIR_DEFAULT = /tmp/netpbm + +# File permissions for installed files. +# Note that on some systems (e.g. Solaris), 'install' can't use the +# mnemonic permissions - you have to use octal. + +# binaries (pbmmake, etc) +INSTALL_PERM_BIN = 755 # u=rwx,go=rx +# shared libraries (libpbm.so, etc) +INSTALL_PERM_LIBD = 755 # u=rwx,go=rx +# static libraries (libpbm.a, etc) +INSTALL_PERM_LIBS = 644 # u=rw,go=r +# header files (pbm.h, etc) +INSTALL_PERM_HDR = 644 # u=rw,go=r +# man pages (pbmmake.1, etc) +INSTALL_PERM_MAN = 644 # u=rw,go=r +# data files (pnmtopalm color maps, etc) +INSTALL_PERM_DATA = 644 # u=rw,go=r + +# Specify the suffix that want the man pages to have. + +SUFFIXMANUALS1 = 1 +SUFFIXMANUALS3 = 3 +SUFFIXMANUALS5 = 5 + +#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the +#Netpbm library functions. The value is used only in make file tests. +# "unixshared" means a unix-style shared library, typically named like +# libxyz.so.2.3 +NETPBMLIBTYPE = unixshared +# "unixstatic" means a unix-style static library, (like libxyz.a) +#NETPBMLIBTYPE = unixstatic +# "dll" means a Windows DLL shared library +#NETPBMLIBTYPE = dll +# "dylib" means a Darwin/Mac OS shared library +#NETPBMLIBTYPE = dylib + +#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is +#selected above. All this is used for is to construct library names. +#The make files never examine the actual value. +NETPBMLIBSUFFIX = so + +# "a" is the suffix for unix-style static libraries. It is also +# traditionally used for shared libraries on AIX. The Visual Age C +# manual says sometimes .so works on AIX, and GNU software for AIX +# 5.1.0 does indeed use it. In our experiments, it works fine if you +# name the library file explicitly on the link, but isn't in the -l +# search order. If you name the library explicitly on the link, the +# library must live in exactly the same position at run time, so we +# can't use that. Therefore, you cannot build both static and shared +# libraries with AIX. You have to choose. +#NETPBMLIBSUFFIX = a +# For HP-UX shared libraries: +#NETPBMLIBSUFFIX = sl +# Darwin/Mac OS shared library: +#NETPBMLIBSUFFIX = dylib +# Windows shared library: +#NETPBMLIBSUFFIX = dll + +#STATICLIB_TOO is "y" to signify that you want a static library built +#and installed in addition to whatever library type you specified by +#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, +#STATICLIB_TOO simply has no effect. +STATICLIB_TOO = y +#STATICLIB_TOO = n + +#STATICLIBSUFFIX is the suffix that static libraries have. It's +#meaningless if you aren't building static libraries. +STATICLIBSUFFIX = a + +#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename +#of a shared library may have on this system. Traditionally, it's +#just "lib", as in libc or libnetpbm. On Windows, though, varying +#prefixes are used when multiple alternative forms of a library are +#available. The first prefix in this list is what we use to name the +#Netpbm shared libraries. +# +# This variable controls how 'libopt' gets built. +# +SHLIBPREFIXLIST = lib + +NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST)) + +#DLLVER is used to version the DLLs built on cygwin or other +#windowsish platforms. We can't add this to LIBROOT, or we'd +#version the static libs (which is bad). We can't add this +#at the end of the name (like unix does with so numbers) because +#windows will only load dlls whose name ends in "dll". So, +#we have this variable, which becomes the end of the library "root" name +#for DLLs only. +# +# This variable controls how 'libopt' gets built. +# +DLLVER = +#Cygwin +#DLLVER = $(NETPBM_MAJOR_RELEASE) + +#NETPBM_DOCURL is the URL of the main documentation page for Netpbm. +#This is a directory which contains a file for each Netpbm program, +#library, and file type. E.g. The documentation for jpegtopnm might be in +#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets +#installed in the man pages (which say no more than to read the webpage) +#and in the Webman netpbm.url file. +NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ +#For a system with no web access, but a local copy of the doc: +#NETPBM_DOCURL = file:/usr/doc/netpbm/ diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb new file mode 100644 index 0000000000..b4f78a57a1 --- /dev/null +++ b/packages/netpbm/netpbm_10.28.bb @@ -0,0 +1,78 @@ +# bitbake configuration file for NetPBM, a command line image (sampled +# data) processing package derived from PBMPlus +# +# For documentation see: http://netpbm.sourceforge.net/doc/ +LICENSE = "GPL MIT Artistic" +# NOTE: individual command line utilities are covered by different +# licenses. The compiled and linked command line utilties are +# subject to the licenses of the libraries they use too - including +# libpng libz, IJG, and libtiff licenses + +SECTION = "console/utils" +DEPENDS = "jpeg zlib libpng tiff install-native flex-native" +RDEPENDS = "perl" +HOMEPAGE = "http://netpbm.sourceforge.net" +DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\ +conversion of images between a variety of different formats. There\ +are over 220 separate tools in the package including converters for\ +about 100 graphics formats." +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \ + file://Makefile.config \ + file://oeendiangen" + +EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD}" + +do_configure() { + install -c -m 644 ../Makefile.config . + # The following stops the host endiangen program being run and uses + # the target endian.h header instead. + install -c -m 755 ../oeendiangen buildtools +} + +do_compile() { + # need all to get the static library too + oe_runmake all default +} + +do_install() { + # netpbm makes its own installation package, which must then be + # installed to form the dummy installation for ipkg + rm -rf ${WORKDIR}/netpbm-package + oe_runmake package pkgdir=${WORKDIR}/netpbm-package + # now install the stuff from the package into ${D} + for d in ${WORKDIR}/netpbm-package/* + do + # following will cause an error if used + case "$d" in + */README) ;; + */VERSION) ;; + */pkginfo) ;; + */bin) install -d ${D}${bindir} + cp -a "$d"/* ${D}${bindir} + rm ${D}${bindir}/doc.url;; + */include) install -d ${D}${includedir} + cp -a "$d"/* ${D}${includedir};; + */link|*/lib) install -d ${D}${libdir} + cp -a "$d"/* ${D}${libdir};; + */man) install -d ${D}${mandir} + cp -a "$d"/* ${D}${mandir};; + */misc) install -d ${D}${datadir}/netpbm + cp -a "$d"/* ${D}${datadir}/netpbm;; + */config_template) + install -d ${D}${bindir} + sed "/^@/d + s!@VERSION@!$(<'${WORKDIR}/netpbm-package/VERSION')! + s!@DATADIR@!${datadir}/netpbm! + s!@LIBDIR@!${libdir}! + s!@LINKDIR@!${libdir}! + s!@INCLUDEDIR@!${includedir}! + s!@BINDIR@!${bindir}! + " "$d" >${D}${bindir}/netpbm-config + chmod 755 ${D}${bindir}/netpbm-config;; + *) echo "netpbm-package/$d: unknown item" >&2 + exit 1;; + esac + done +} diff --git a/packages/nonworking/crimsonfields/crimsonfields_0.4.6.bb b/packages/nonworking/crimsonfields/crimsonfields_0.4.6.bb deleted file mode 100644 index 0674506547..0000000000 --- a/packages/nonworking/crimsonfields/crimsonfields_0.4.6.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Crimson Fields is a tactical war game in the tradition of Battle Isle." -SECTION = "games" -PRIORITY = "optional" -DEPENDS = "virtual/libsdl libsdl-mixer libsdl-ttf" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL" - -SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2" -S = "${WORKDIR}/crimson-${PV}" - -inherit autotools - -do_configure() { - gnu-configize - oe_runconf -} - -do_compile() { - cd tools && oe_runmake \ - CC="${BUILD_CC}" CXX="${BUILD_CXX}" LD="${BUILD_CCLD}" \ - CFLAGS="${BUILD_CFLAGS}" CXXFLAGS="${BUILD_CXXFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" - cd ${S} && oe_runmake -} - -# FIXME: Add .desktop file for Opie/Qtopia diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb index bb2997eb0b..3ca809f002 100644 --- a/packages/openntpd/openntpd_3.7p1.bb +++ b/packages/openntpd/openntpd_3.7p1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD" SECTION = "console/network" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "timezones" -PR="r6" +PR="r7" SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -19,7 +19,7 @@ INITSCRIPT_NAME = "openntpd" INITSCRIPT_PARAMS = "defaults" -inherit autotools +inherit autotools update-rc.d EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \ --sysconfdir=/etc --with-privsep-path=/var/shared/empty \ diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index e3f78c2de5..47225eb532 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -11,7 +11,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -PR = "r1" +PR = "r4" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -46,11 +46,13 @@ do_compile_append () { do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd + mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh + mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh } PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc" -FILES_openssh-scp = "${bindir}/scp" -FILES_openssh-ssh = "${bindir}/ssh ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" +FILES_openssh-scp = "${bindir}/scp.${PN}" +FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd" FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server" @@ -65,10 +67,18 @@ if test "x$D" != "x"; then else addgroup sshd adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd - update-rc.d sshd defaults + update-rc.d sshd defaults 9 fi } +pkg_postinst_openssh-scp() { + update-alternatives --install ${bindir}/scp scp scp.${PN} 90 +} + +pkg_postinst_openssh-ssh() { + update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 +} + pkg_postrm_openssh-sshd() { if test "x$D" != "x"; then exit 1 diff --git a/packages/orinoco/orinoco-modules-0.15rc1/add_event.patch b/packages/orinoco/orinoco-modules-0.15rc1/add_event.patch new file mode 100644 index 0000000000..f8b86f335b --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.15rc1/add_event.patch @@ -0,0 +1,56 @@ +Index: orinoco-0.15rc2/orinoco_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/orinoco_cs.c 2004-07-28 07:06:45.000000000 +0100 ++++ orinoco-0.15rc2/orinoco_cs.c 2005-08-03 18:38:34.000000000 +0100 +@@ -189,11 +189,13 @@ + + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = + CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &orinoco_cs_event; ++#endif + client_reg.Version = 0x0210; /* FIXME: what does this mean? */ + client_reg.event_callback_args.client_data = link; + +@@ -612,6 +614,9 @@ + .name = DRIVER_NAME, + }, + .attach = orinoco_cs_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = orinoco_cs_event, ++#endif + .detach = orinoco_cs_detach, + }; + +Index: orinoco-0.15rc2/spectrum_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/spectrum_cs.c 2005-08-03 11:51:09.000000000 +0100 ++++ orinoco-0.15rc2/spectrum_cs.c 2005-08-03 18:38:46.000000000 +0100 +@@ -699,11 +699,13 @@ + + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = + CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &spectrum_cs_event; ++#endif + client_reg.Version = 0x0210; /* FIXME: what does this mean? */ + client_reg.event_callback_args.client_data = link; + +@@ -1096,6 +1098,9 @@ + .name = DRIVER_NAME, + }, + .attach = spectrum_cs_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = spectrum_cs_event, ++#endif + .detach = spectrum_cs_detach, + }; + diff --git a/packages/orinoco/orinoco-modules-0.15rc1/add_utsname.patch b/packages/orinoco/orinoco-modules-0.15rc1/add_utsname.patch new file mode 100644 index 0000000000..864910eb85 --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.15rc1/add_utsname.patch @@ -0,0 +1,9 @@ +Index: orinoco-0.15rc1/kcompat.h +=================================================================== +--- orinoco-0.15rc1.orig/kcompat.h 2005-08-03 14:51:18.000000000 +0000 ++++ orinoco-0.15rc1/kcompat.h 2005-08-03 15:11:02.000000000 +0000 +@@ -1,3 +1,4 @@ ++#include <linux/utsname.h> + #include <linux/version.h> + + /********************************************************************/ diff --git a/packages/orinoco/orinoco-modules-0.15rc1/spectrum_cs_ids.patch b/packages/orinoco/orinoco-modules-0.15rc1/spectrum_cs_ids.patch new file mode 100644 index 0000000000..709e05a435 --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.15rc1/spectrum_cs_ids.patch @@ -0,0 +1,101 @@ +Index: orinoco-0.15rc2/spectrum_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/spectrum_cs.c 2005-08-03 18:43:58.000000000 +0100 ++++ orinoco-0.15rc2/spectrum_cs.c 2005-08-03 22:27:03.000000000 +0100 +@@ -1092,6 +1092,17 @@ + " (Pavel Roskin <proski@gnu.org>," + " David Gibson <hermes@gibson.dropbear.id.au>, et al)"; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++static struct pcmcia_device_id spectrum_cs_ids[] = { ++ PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), ++ PCMCIA_DEVICE_PROD_ID12("Symbol", "Spectrum24 LA4100 Series WLAN PC Card", 0xd20d85fd, 0x63066cd9), ++ PCMCIA_DEVICE_NULL, ++}; ++MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids); ++#endif ++ + static struct pcmcia_driver orinoco_driver = { + .owner = THIS_MODULE, + .drv = { +@@ -1100,6 +1111,7 @@ + .attach = spectrum_cs_attach, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) + .event = spectrum_cs_event, ++ .id_table = spectrum_cs_ids, + #endif + .detach = spectrum_cs_detach, + }; +Index: orinoco-0.15rc2/orinoco_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/orinoco_cs.c 2005-08-03 18:43:55.000000000 +0100 ++++ orinoco-0.15rc2/orinoco_cs.c 2005-08-03 22:58:58.000000000 +0100 +@@ -608,6 +608,58 @@ + " (David Gibson <hermes@gibson.dropbear.id.au>, " + "Pavel Roskin <proski@gnu.org>, et al)"; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++static struct pcmcia_device_id orinoco_cs_ids[] = { ++ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), ++ PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), ++ PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0305), ++ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), ++ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), ++ PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), ++ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), ++ PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), ++ PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), ++ PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3), ++ PCMCIA_DEVICE_PROD_ID123("Instant Wireless ", " Network PC CARD", "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0), ++ PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5), ++ PCMCIA_DEVICE_PROD_ID12("Avaya Communication", "Avaya Wireless PC Card", 0xd8a43b78, 0x0d341169), ++ PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-PCM-L11G", 0x2decece3, 0xf57ca4b3), ++ PCMCIA_DEVICE_PROD_ID12("Cabletron", "RoamAbout 802.11 DS", 0x32d445f5, 0xedeffd90), ++ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11", 0x5261440f, 0xa6405584), ++ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9), ++ PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card", 0x71b18589, 0xf144e3ac), ++ PCMCIA_DEVICE_PROD_ID12("D", "Link DWL-650 11Mbps WLAN Card", 0x71b18589, 0xb6f1b0ab), ++ PCMCIA_DEVICE_PROD_ID12("ELSA", "AirLancer MC-11", 0x4507a33a, 0xef54f0e3), ++ PCMCIA_DEVICE_PROD_ID12("HyperLink", "Wireless PC Card 11Mbps", 0x56cc3f1a, 0x0bcf220c), ++ PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18), ++ PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a), ++ PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410), ++ PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3), ++ PCMCIA_DEVICE_PROD_ID12("Microsoft", "Wireless Notebook Adapter MN-520", 0x5961bf85, 0x6eec8c01), ++ PCMCIA_DEVICE_PROD_ID12("NCR", "WaveLAN/IEEE", 0x24358cd4, 0xc562e72a), ++ PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401RA Wireless PC", "Card", 0x0306467f, 0x9762e8f1), ++ PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110", 0x209f40ab, 0xd9715264), ++ PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9), ++ PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b), ++ PCMCIA_DEVICE_PROD_ID1("Symbol Technologies", 0x3f02b4d6), ++ PCMCIA_DEVICE_NULL, ++}; ++MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids); ++#endif ++ + static struct pcmcia_driver orinoco_driver = { + .owner = THIS_MODULE, + .drv = { +@@ -616,6 +668,7 @@ + .attach = orinoco_cs_attach, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) + .event = orinoco_cs_event, ++ .id_table = orinoco_cs_ids, + #endif + .detach = orinoco_cs_detach, + }; diff --git a/packages/orinoco/orinoco-modules-0.15rc2/add_event.patch b/packages/orinoco/orinoco-modules-0.15rc2/add_event.patch new file mode 100644 index 0000000000..f8b86f335b --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.15rc2/add_event.patch @@ -0,0 +1,56 @@ +Index: orinoco-0.15rc2/orinoco_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/orinoco_cs.c 2004-07-28 07:06:45.000000000 +0100 ++++ orinoco-0.15rc2/orinoco_cs.c 2005-08-03 18:38:34.000000000 +0100 +@@ -189,11 +189,13 @@ + + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = + CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &orinoco_cs_event; ++#endif + client_reg.Version = 0x0210; /* FIXME: what does this mean? */ + client_reg.event_callback_args.client_data = link; + +@@ -612,6 +614,9 @@ + .name = DRIVER_NAME, + }, + .attach = orinoco_cs_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = orinoco_cs_event, ++#endif + .detach = orinoco_cs_detach, + }; + +Index: orinoco-0.15rc2/spectrum_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/spectrum_cs.c 2005-08-03 11:51:09.000000000 +0100 ++++ orinoco-0.15rc2/spectrum_cs.c 2005-08-03 18:38:46.000000000 +0100 +@@ -699,11 +699,13 @@ + + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = + CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &spectrum_cs_event; ++#endif + client_reg.Version = 0x0210; /* FIXME: what does this mean? */ + client_reg.event_callback_args.client_data = link; + +@@ -1096,6 +1098,9 @@ + .name = DRIVER_NAME, + }, + .attach = spectrum_cs_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = spectrum_cs_event, ++#endif + .detach = spectrum_cs_detach, + }; + diff --git a/packages/orinoco/orinoco-modules-0.15rc2/add_utsname.patch b/packages/orinoco/orinoco-modules-0.15rc2/add_utsname.patch new file mode 100644 index 0000000000..7c2efec2f3 --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.15rc2/add_utsname.patch @@ -0,0 +1,21 @@ +Index: orinoco-0.15rc1/kcompat.h +=================================================================== +--- orinoco-0.15rc1.orig/kcompat.h 2005-08-03 14:51:18.000000000 +0000 ++++ orinoco-0.15rc1/kcompat.h 2005-08-03 15:11:02.000000000 +0000 +@@ -1,3 +1,4 @@ ++#include <linux/utsname.h> + #include <linux/version.h> + + /********************************************************************/ +Index: orinoco-0.15rc2/orinoco.h +=================================================================== +--- orinoco-0.15rc2.orig/orinoco.h 2004-07-28 07:06:45.000000000 +0100 ++++ orinoco-0.15rc2/orinoco.h 2005-08-03 18:43:46.000000000 +0100 +@@ -13,6 +13,7 @@ + #include <linux/spinlock.h> + #include <linux/netdevice.h> + #include <linux/wireless.h> ++#include <linux/utsname.h> + #include <linux/version.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25) + #include <linux/moduleparam.h> diff --git a/packages/orinoco/orinoco-modules-0.15rc2/spectrum_cs_ids.patch b/packages/orinoco/orinoco-modules-0.15rc2/spectrum_cs_ids.patch new file mode 100644 index 0000000000..709e05a435 --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.15rc2/spectrum_cs_ids.patch @@ -0,0 +1,101 @@ +Index: orinoco-0.15rc2/spectrum_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/spectrum_cs.c 2005-08-03 18:43:58.000000000 +0100 ++++ orinoco-0.15rc2/spectrum_cs.c 2005-08-03 22:27:03.000000000 +0100 +@@ -1092,6 +1092,17 @@ + " (Pavel Roskin <proski@gnu.org>," + " David Gibson <hermes@gibson.dropbear.id.au>, et al)"; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++static struct pcmcia_device_id spectrum_cs_ids[] = { ++ PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), ++ PCMCIA_DEVICE_PROD_ID12("Symbol", "Spectrum24 LA4100 Series WLAN PC Card", 0xd20d85fd, 0x63066cd9), ++ PCMCIA_DEVICE_NULL, ++}; ++MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids); ++#endif ++ + static struct pcmcia_driver orinoco_driver = { + .owner = THIS_MODULE, + .drv = { +@@ -1100,6 +1111,7 @@ + .attach = spectrum_cs_attach, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) + .event = spectrum_cs_event, ++ .id_table = spectrum_cs_ids, + #endif + .detach = spectrum_cs_detach, + }; +Index: orinoco-0.15rc2/orinoco_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/orinoco_cs.c 2005-08-03 18:43:55.000000000 +0100 ++++ orinoco-0.15rc2/orinoco_cs.c 2005-08-03 22:58:58.000000000 +0100 +@@ -608,6 +608,58 @@ + " (David Gibson <hermes@gibson.dropbear.id.au>, " + "Pavel Roskin <proski@gnu.org>, et al)"; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++static struct pcmcia_device_id orinoco_cs_ids[] = { ++ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), ++ PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), ++ PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0305), ++ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), ++ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), ++ PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), ++ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), ++ PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), ++ PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), ++ PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3), ++ PCMCIA_DEVICE_PROD_ID123("Instant Wireless ", " Network PC CARD", "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0), ++ PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5), ++ PCMCIA_DEVICE_PROD_ID12("Avaya Communication", "Avaya Wireless PC Card", 0xd8a43b78, 0x0d341169), ++ PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-PCM-L11G", 0x2decece3, 0xf57ca4b3), ++ PCMCIA_DEVICE_PROD_ID12("Cabletron", "RoamAbout 802.11 DS", 0x32d445f5, 0xedeffd90), ++ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11", 0x5261440f, 0xa6405584), ++ PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9), ++ PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card", 0x71b18589, 0xf144e3ac), ++ PCMCIA_DEVICE_PROD_ID12("D", "Link DWL-650 11Mbps WLAN Card", 0x71b18589, 0xb6f1b0ab), ++ PCMCIA_DEVICE_PROD_ID12("ELSA", "AirLancer MC-11", 0x4507a33a, 0xef54f0e3), ++ PCMCIA_DEVICE_PROD_ID12("HyperLink", "Wireless PC Card 11Mbps", 0x56cc3f1a, 0x0bcf220c), ++ PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18), ++ PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a), ++ PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410), ++ PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3), ++ PCMCIA_DEVICE_PROD_ID12("Microsoft", "Wireless Notebook Adapter MN-520", 0x5961bf85, 0x6eec8c01), ++ PCMCIA_DEVICE_PROD_ID12("NCR", "WaveLAN/IEEE", 0x24358cd4, 0xc562e72a), ++ PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401RA Wireless PC", "Card", 0x0306467f, 0x9762e8f1), ++ PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110", 0x209f40ab, 0xd9715264), ++ PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9), ++ PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b), ++ PCMCIA_DEVICE_PROD_ID1("Symbol Technologies", 0x3f02b4d6), ++ PCMCIA_DEVICE_NULL, ++}; ++MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids); ++#endif ++ + static struct pcmcia_driver orinoco_driver = { + .owner = THIS_MODULE, + .drv = { +@@ -616,6 +668,7 @@ + .attach = orinoco_cs_attach, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) + .event = orinoco_cs_event, ++ .id_table = orinoco_cs_ids, + #endif + .detach = orinoco_cs_detach, + }; diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb index 01c2f287ad..17428f35a3 100644 --- a/packages/orinoco/orinoco-modules_0.15rc1.bb +++ b/packages/orinoco/orinoco-modules_0.15rc1.bb @@ -4,11 +4,14 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \ file://makefile_fix.patch;patch=1 \ file://list-move.patch;patch=1 \ + file://add_event.patch;patch=1 \ + file://add_utsname.patch;patch=1 \ + file://spectrum_cs_ids.patch;patch=1 \ file://spectrum-firmware.patch;patch=1 \ file://spectrum.conf \ file://spectrum_fw.h \ diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb index 73140f8d4c..60cae87857 100644 --- a/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/packages/orinoco/orinoco-modules_0.15rc2.bb @@ -5,14 +5,14 @@ PRIORITY = "optional" PROVIDES = "spectrum-modules" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r6" - -# seems to cause problems on arm -DEFAULT_PREFERENCE_arm = "-1" +PR = "r7" SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \ file://makefile_fix.patch;patch=1 \ file://list-move.patch;patch=1 \ + file://add_utsname.patch;patch=1 \ + file://add_event.patch;patch=1 \ + file://spectrum_cs_ids.patch;patch=1 \ file://spectrum-firmware.patch;patch=1 \ file://catch-up-with-kernel-changes.patch;patch=1 \ file://spectrum.conf \ diff --git a/packages/perl/files/config.sh-mipsel-linux b/packages/perl/files/config.sh-mipsel-linux index 299b0441ed..eedf443f04 100644 --- a/packages/perl/files/config.sh-mipsel-linux +++ b/packages/perl/files/config.sh-mipsel-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.3/mipsel-linux' -archlibexp='/usr/lib/perl5/5.8.3/mipsel-linux' +archlib='/usr/lib/perl5/5.8.4/mipsel-linux' +archlibexp='/usr/lib/perl5/5.8.4/mipsel-linux' archname64='' archname='mips-linux' archobjs='' @@ -668,7 +668,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.3/mipsel-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.4/mipsel-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -676,13 +676,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.3' +installprivlib='./install_me_here/usr/lib/perl5/5.8.4' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.3' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -809,8 +809,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.3' -privlibexp='/usr/lib/perl5/5.8.3' +privlib='/usr/lib/perl5/5.8.4' +privlibexp='/usr/lib/perl5/5.8.4' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -871,8 +871,8 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0' sig_size='131' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' @@ -962,6 +962,7 @@ uselongdouble='undef' usemorebits='undef' usemultiplicity='undef' usemymalloc='n' +usemallocwrap='define' usenm='false' useopcode='true' useperlio='define' @@ -1000,13 +1001,13 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.3' +version='5.8.4' version_patchlevel_string='version 8 subversion 3' versiononly='undef' vi='' voidflags='15' xlibpth='/usr/lib/386 /lib/386' -xs_apiversion='5.8.3' +xs_apiversion='5.8.4' yacc='yacc' yaccflags='' zcat='' @@ -1022,5 +1023,4 @@ PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=8 PERL_API_SUBVERSION=0 -PERL_PATCHLEVEL= -PERL_CONFIG_SH=true +PERL_PATCHLEVELPERL_CONFIG_SH=true diff --git a/packages/perl/perl-5.8.7/config.sh-i386-linux b/packages/perl/perl-5.8.7/config.sh-i386-linux index fda13d0d9b..ee989f66bb 100644 --- a/packages/perl/perl-5.8.7/config.sh-i386-linux +++ b/packages/perl/perl-5.8.7/config.sh-i386-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.4/i386-linux' -archlibexp='/usr/lib/perl5/5.8.4/i386-linux' +archlib='/usr/lib/perl5/5.8.7/i386-linux' +archlibexp='/usr/lib/perl5/5.8.7/i386-linux' archname64='' archname='i386-linux' archobjs='' @@ -55,7 +55,7 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-fpic' -ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i386-linux/CORE' +ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.7/i386-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='gcc' @@ -435,6 +435,8 @@ d_strerrm='strerror(e)' d_strerror='define' d_strerror_r='undef' d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' d_strtod='define' d_strtol='define' d_strtold='define' @@ -669,7 +671,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i386-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.7/i386-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -677,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.4' +installprivlib='./install_me_here/usr/lib/perl5/5.8.7' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i386-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/i386-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -809,8 +811,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.4' -privlibexp='/usr/lib/perl5/5.8.4' +privlib='/usr/lib/perl5/5.8.7' +privlibexp='/usr/lib/perl5/5.8.7' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -871,17 +873,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' sig_size='69' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.4/i386-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i386-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.7/i386-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.7/i386-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.8.4' +sitelib='/usr/lib/perl5/site_perl/5.8.7' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.8.4' +sitelibexp='/usr/lib/perl5/site_perl/5.8.7' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1002,7 +1004,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.4' +version='5.8.7' version_patchlevel_string='version 8 subversion 4' versiononly='undef' vi='' diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux index 313ff2fbb1..7d5a531266 100644 --- a/packages/perl/perl-5.8.7/config.sh-i686-linux +++ b/packages/perl/perl-5.8.7/config.sh-i686-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.4/i686-linux' -archlibexp='/usr/lib/perl5/5.8.4/i686-linux' +archlib='/usr/lib/perl5/5.8.7/i686-linux' +archlibexp='/usr/lib/perl5/5.8.7/i686-linux' archname64='' archname='i686-linux' archobjs='' @@ -55,7 +55,7 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-fpic' -ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i686-linux/CORE' +ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.7/i686-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='gcc' @@ -435,6 +435,8 @@ d_strerrm='strerror(e)' d_strerror='define' d_strerror_r='undef' d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' d_strtod='define' d_strtol='define' d_strtold='define' @@ -669,7 +671,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i686-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.7/i686-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -677,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.4' +installprivlib='./install_me_here/usr/lib/perl5/5.8.7' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i686-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/i686-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -809,8 +811,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.4' -privlibexp='/usr/lib/perl5/5.8.4' +privlib='/usr/lib/perl5/5.8.7' +privlibexp='/usr/lib/perl5/5.8.7' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -871,17 +873,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' sig_size='69' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.4/i686-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i686-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.7/i686-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.7/i686-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.8.4' +sitelib='/usr/lib/perl5/site_perl/5.8.7' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.8.4' +sitelibexp='/usr/lib/perl5/site_perl/5.8.7' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1002,7 +1004,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.4' +version='5.8.7' version_patchlevel_string='version 8 subversion 4' versiononly='undef' vi='' diff --git a/packages/perl/perl-5.8.7/config.sh-mipsel-linux b/packages/perl/perl-5.8.7/config.sh-mipsel-linux index fa5f0a5b47..7696a3dff0 100644 --- a/packages/perl/perl-5.8.7/config.sh-mipsel-linux +++ b/packages/perl/perl-5.8.7/config.sh-mipsel-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.3/mipsel-linux' -archlibexp='/usr/lib/perl5/5.8.3/mipsel-linux' +archlib='/usr/lib/perl5/5.8.7/mipsel-linux' +archlibexp='/usr/lib/perl5/5.8.7/mipsel-linux' archname64='' archname='mips-linux' archobjs='' @@ -435,6 +435,8 @@ d_strerrm='strerror(e)' d_strerror='define' d_strerror_r='undef' d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' d_strtod='define' d_strtol='define' d_strtold='define' @@ -669,7 +671,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.3/mipsel-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.7/mipsel-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -677,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.3' +installprivlib='./install_me_here/usr/lib/perl5/5.8.7' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/mipsel-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.3' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -810,8 +812,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.3' -privlibexp='/usr/lib/perl5/5.8.3' +privlib='/usr/lib/perl5/5.8.7' +privlibexp='/usr/lib/perl5/5.8.7' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -872,8 +874,8 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0' sig_size='131' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' @@ -963,6 +965,7 @@ uselongdouble='undef' usemorebits='undef' usemultiplicity='undef' usemymalloc='n' +usemallocwrap='define' usenm='false' useopcode='true' useperlio='define' @@ -1002,13 +1005,13 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.3' -version_patchlevel_string='version 8 subversion 3' +version='5.8.7' +version_patchlevel_string='version 8 subversion 7' versiononly='undef' vi='' voidflags='15' xlibpth='/usr/lib/386 /lib/386' -xs_apiversion='5.8.3' +xs_apiversion='5.8.7' yacc='yacc' yaccflags='' zcat='' diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 3500ca57bd..250c306743 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -1,11 +1,12 @@ MAINTAINER="David Karlstrom <daka@thg.se>" +DEFAULT_PREFERENCE="-1" include perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-i386-linux" -PR = "r10" +PR = "r12" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl diff --git a/packages/procps/procps-3.2.5/install.patch b/packages/procps/procps-3.2.5/install.patch index a05eec4ab6..9f1ef6915d 100644 --- a/packages/procps/procps-3.2.5/install.patch +++ b/packages/procps/procps-3.2.5/install.patch @@ -1,25 +1,27 @@ -*** procps-3.2.5/Makefile.orig Sun Jul 24 03:29:32 2005 ---- procps-3.2.5/Makefile Sun Jul 24 03:30:14 2005 -*************** -*** 211,220 **** - ###### install - - $(BINFILES) : all -! $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all -! $(install) --mode a=r $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice ---- 211,220 ---- - ###### install - - $(BINFILES) : all -! $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -! $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice +--- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 ++++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 +@@ -30,7 +30,10 @@ + install := install -D --owner 0 --group 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++# lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++ ++# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. ++lib64 := lib + + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ +@@ -211,10 +214,10 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) -m 555 $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) -m 444 $(notdir $@) $@ + + install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) + cd $(usr/bin) && $(ln_f) skill snice diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb index 51e37a106b..21b2783e55 100644 --- a/packages/procps/procps_3.2.5.bb +++ b/packages/procps/procps_3.2.5.bb @@ -7,7 +7,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DEPENDS = "ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ file://install.patch;patch=1 \ diff --git a/packages/qt/qt-x11-free_3.3.3.bb b/packages/qt/qt-x11-free_3.3.3.bb index 8304de1461..1aaef72d1c 100644 --- a/packages/qt/qt-x11-free_3.3.3.bb +++ b/packages/qt/qt-x11-free_3.3.3.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql" -PR = "r6" +PR = "r8" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ @@ -24,6 +24,7 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"' do_configure() { @@ -35,6 +36,8 @@ do_configure() { find . -name "Makefile"|xargs rm -f (cd src && qmake -spec ${QMAKESPEC} ) (cd plugins/src && qmake -spec ${QMAKESPEC} ) + (cd tools && qmake -spec ${QMAKESPEC} ) + (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) } do_compile() { @@ -42,6 +45,8 @@ do_compile() { unset CXXFLAGS oe_runmake -C src ${EXTRA_ENV} oe_runmake -C plugins/src ${EXTRA_ENV} + oe_runmake -C tools ${EXTRA_ENV} + oe_runmake -C tools/qvfb ${EXTRA_ENV} } do_stage() { @@ -56,14 +61,27 @@ do_stage() { do install -m 0644 $f ${STAGING_QT_DIR}/include/private done + for f in lib/*.prl + do + install -m 0644 $f ${STAGING_QT_DIR}/lib + done } do_install() { install -d ${D}${libdir}/ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ - oe_runmake -C plugins/src INSTALL_ROOT="${D}" ${EXTRA_ENV} install + install -d ${D}${bindir}/ + install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} + install -d ${D}${prefix}/plugins/ + cp -a plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ } -PACKAGES += "qt-x11-plugins" -FILES_qt-x11-plugins = "${prefix}/plugins" - +PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" +FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" +FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" +FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" +FILES_qt-x11-designer = "${bindir}/designer" +FILES_qt-x11-assistant = "${bindir}/assistant" +FILES_qt-x11-qvfb = "${bindir}/qvfb" +FILES_qt-x11-qtconfig = "${bindir}/qtconfig" diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index dbc85efb44..c008fe27f5 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r12" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -10,13 +10,14 @@ SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ S := ${WORKDIR}/${P}/source include samba.inc +inherit update-rc.d INITSCRIPT_NAME = "samba" # No dependencies, goes in at level 20 (NOTE: take care with the # level, later levels put the shutdown later too - see the links # in rc6.d, the shutdown must precede network shutdown). INITSCRIPT_PARAMS = "defaults" -#CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" +CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" # The file system settings --foodir=dirfoo and overridden unconditionally # in the samba config by --with-foodir=dirfoo - even if the --with is not diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 491dfca9dc..88c6f13d9d 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -4,8 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \ - file://tremor.patch;patch=1 \ - file://mouse.patch;patch=1 " + file://tremor.patch;patch=1" inherit autotools diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index 8e70acef68..6f805b6b4d 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -1,5 +1,6 @@ include scummvm.inc DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" +SRC_URI += " file://mouse.patch;patch=1 " do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb index b53e1b3127..bbb02199a7 100644 --- a/packages/thttpd/thttpd_2.25b.bb +++ b/packages/thttpd/thttpd_2.25b.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server." LICENSE = "BSD" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://www.acme.com/software/thttpd/" -PR="r4" +PR="r5" SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \ file://install.patch;patch=1 \ @@ -13,7 +13,7 @@ S = "${WORKDIR}/thttpd-${PV}" INITSCRIPT_NAME = "thttpd" INITSCRIPT_PARAMS = "defaults" -inherit autotools +inherit autotools update-rc.d EXTRA_OEMAKE += "'WEBDIR=${servicedir}/www'" FILES_${PN}_append = " ${servicedir}" diff --git a/packages/wakelan/.mtn2git_empty b/packages/wakelan/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wakelan/.mtn2git_empty diff --git a/packages/wakelan/wakelan_1.1.bb b/packages/wakelan/wakelan_1.1.bb new file mode 100644 index 0000000000..7f4d66c167 --- /dev/null +++ b/packages/wakelan/wakelan_1.1.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +DESCRIPTION = "Wakelan sends a magic packet to wake up remote PC's" +PR = "r0" + +FILES = "${bindir}/wakelan" +SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/misc/${PN}-${PV}.tar.gz" + +inherit autotools + +do_install () { + install -d ${bindir} + install -m 0755 ${WORKDIR}/${PN}-${PV}/wakelan ${D}${bindir}/wakelan +} diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb deleted file mode 100644 index 521d47697e..0000000000 --- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -# xfce-mcs-manager OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Settings manager." - -DEPENDS="libxfcegui4 libxfce4mcs" - -inherit xfce - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4 - install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager - install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager -} - -# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live -# the standard pkgconfig mangling was confusing us. Mangling is not required -# for this particular .pc, so the following will suffice: - -do_stage_append () { - install -d ${PKG_CONFIG_PATH} - install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc -} diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc index 14dfe175ea..b5b4505e98 100644 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc +++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc @@ -2,8 +2,11 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="Common XFCE4 configuration plugins." -DEPENDS="libxfcegui4 xfce-mcs-manager gtk+" -SECTION="x11" +DESCRIPTION = "Common XFCE4 configuration plugins." +DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" +SECTION = "x11" inherit xfce + +PACKAGES += "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb deleted file mode 100644 index 92046c0b81..0000000000 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="Common XFCE4 configuration plugins." -DEPENDS="libxfcegui4 xfce-mcs-manager gtk+" -inherit xfce diff --git a/packages/xfce-utils/xfce-utils_4.2.0.bb b/packages/xfce-utils/xfce-utils_4.2.0.bb deleted file mode 100644 index 8498cbf088..0000000000 --- a/packages/xfce-utils/xfce-utils_4.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -PR="r1" - -DESCRIPTION="XFCE4 Utilities" -DEPENDS="x11 libxfcegui4 xfce-mcs-manager" -inherit xfce - -FILES_${PN} += " /usr/share/xfce4/AUTHORS \ - /usr/share/xfce4/BSD \ - /usr/share/xfce4/COPYING \ - /usr/share/xfce4/GPL \ - /usr/share/xfce4/INFO \ - /usr/share/xfce4/LGPL \ - /usr/share/xfce4/AUTHORS.html \ - /usr/share/xfce4/BSD.html \ - /usr/share/xfce4/COPYING.html \ - /usr/share/xfce4/GPL.html \ - /usr/share/xfce4/INFO.html \ - /usr/share/xfce4/LGPL.html" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb deleted file mode 100644 index 0d102f3bd0..0000000000 --- a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE Application Finder" -SECTION = "x11" -inherit xfce -DEPENDS="libxfcegui4" diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb deleted file mode 100644 index a923489f32..0000000000 --- a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# xfce-mixer-plugin OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE panel mixer plugin" -SECTION = "x11" - -DEPENDS="xfce4-panel" -inherit xfce diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc index 4950da6f68..30473eea06 100644 --- a/packages/xfce4-panel/xfce4-panel.inc +++ b/packages/xfce4-panel/xfce4-panel.inc @@ -2,17 +2,14 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE4 Panel" +DESCRIPTION = "XFCE4 Panel" SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" +DEPENDS = "startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + inherit pkgconfig xfce EXTRA_OECONF += " --enable-startup-notification" -do_install() { - oe_runmake DESTDIR=${D} install -} - HEADERS="controls.h global.h icons.h main.h panel.h item.h \ item_dialog.h plugins.h xfce_support.h xfce.h" @@ -23,3 +20,10 @@ do_stage() { install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file done } + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" diff --git a/packages/xfce4-panel/xfce4-panel_4.2.0.bb b/packages/xfce4-panel/xfce4-panel_4.2.0.bb deleted file mode 100644 index 4950da6f68..0000000000 --- a/packages/xfce4-panel/xfce4-panel_4.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce4-panel OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Panel" -SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" -inherit pkgconfig xfce - -EXTRA_OECONF += " --enable-startup-notification" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -HEADERS="controls.h global.h icons.h main.h panel.h item.h \ - item_dialog.h plugins.h xfce_support.h xfce.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/panel - - for file in ${HEADERS}; do - install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file - done -} |