diff options
162 files changed, 3286 insertions, 379 deletions
diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 752881314d..ff6929d757 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -68,9 +68,9 @@ do_stage_append () { fi } -PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}-themes ${SRCNAME}" +PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" FILES_${SRCNAME} = "${libdir}" -FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" +FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" diff --git a/classes/module.bbclass b/classes/module.bbclass index 4da3f5f30b..8a13f1f858 100644 --- a/classes/module.bbclass +++ b/classes/module.bbclass @@ -34,6 +34,18 @@ module_do_install() { oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install } +pkg_postinst_append () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -A + update-modules || true +} + +pkg_postrm_append () { + update-modules || true +} + EXPORT_FUNCTIONS do_compile do_install FILES_${PN} = "/etc /lib/modules" diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 45c4ecef79..e12fc4ef2a 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -43,7 +43,7 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_x11 = "diet-x11" -include conf/distro/preferred-gpe-versions.inc +include conf/distro/preferred-gpe-versions-2.7.inc # # E diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf index 3ab2c056ae..158d7757b6 100644 --- a/conf/distro/openslug-native-packages.conf +++ b/conf/distro/openslug-native-packages.conf @@ -1,10 +1,11 @@ # automatically generated by bitbake freeze BBFILES := "\ -${PKGDIR}/packages/gzip/*.bb \ +${PKGDIR}/packages/apache/*.bb \ +${PKGDIR}/packages/openssl/*.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 \ +${PKGDIR}/packages/pcre/*.bb \ +${PKGDIR}/packages/expat/*.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-packages.conf b/conf/distro/openslug-packages.conf index 27ee4fa30e..b83060a200 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -1,6 +1,8 @@ BBFILES := "\ +${PKGDIR}/packages/alsa/*.bb \ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ +${PKGDIR}/packages/aumix/*.bb \ ${PKGDIR}/packages/autoconf/*.bb \ ${PKGDIR}/packages/automake/*.bb \ ${PKGDIR}/packages/base-files/*.bb \ @@ -44,6 +46,7 @@ ${PKGDIR}/packages/gcc/*.bb \ ${PKGDIR}/packages/gdb/*.bb \ ${PKGDIR}/packages/gdbm/*.bb \ ${PKGDIR}/packages/gettext/*.bb \ +${PKGDIR}/packages/glib-1.2/*.bb \ ${PKGDIR}/packages/glib-2.0/*.bb \ ${PKGDIR}/packages/glibc/*.bb \ ${PKGDIR}/packages/gnu-config/*.bb \ @@ -61,10 +64,12 @@ ${PKGDIR}/packages/ipkg/*.bb \ ${PKGDIR}/packages/iptables/*.bb \ ${PKGDIR}/packages/iputils/*.bb \ ${PKGDIR}/packages/ircp/*.bb \ +${PKGDIR}/packages/irssi/*.bb \ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ ${PKGDIR}/packages/joe/*.bb \ +${PKGDIR}/packages/lcdproc/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ ${PKGDIR}/packages/libao/*.bb \ @@ -75,6 +80,7 @@ ${PKGDIR}/packages/liblockfile/*.bb \ ${PKGDIR}/packages/libmad/*.bb \ ${PKGDIR}/packages/libmikmod/*.bb \ ${PKGDIR}/packages/libogg/*.bb \ +${PKGDIR}/packages/libol/*.bb \ ${PKGDIR}/packages/libpcap/*.bb \ ${PKGDIR}/packages/libpng/*.bb \ ${PKGDIR}/packages/libtiff/*.bb \ @@ -144,6 +150,7 @@ ${PKGDIR}/packages/puppy/*.bb \ ${PKGDIR}/packages/pwc/*.bb \ ${PKGDIR}/packages/python/*.bb \ ${PKGDIR}/packages/quilt/*.bb \ +${PKGDIR}/packages/qc-usb-messenger/*.bb \ ${PKGDIR}/packages/readline/*.bb \ ${PKGDIR}/packages/reiser4progs/*.bb \ ${PKGDIR}/packages/reiserfsprogs/*.bb \ @@ -154,11 +161,13 @@ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/spca5xx/*.bb \ ${PKGDIR}/packages/ssmtp/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ ${PKGDIR}/packages/sysfsutils/*.bb \ +${PKGDIR}/packages/syslog-ng/*.bb \ ${PKGDIR}/packages/sysvinit/*.bb \ ${PKGDIR}/packages/tar/*.bb \ ${PKGDIR}/packages/thttpd/*.bb \ diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index d468d89e65..e35f997529 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -48,7 +48,7 @@ include conf/distro/preferred-opie-versions.inc # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDER_x11 = "diet-x11" -include conf/distro/preferred-gpe-versions.inc +include conf/distro/preferred-gpe-versions-2.7.inc # # E diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc new file mode 100644 index 0000000000..1d512fa292 --- /dev/null +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -0,0 +1,88 @@ +# +# Specify which versions of GPE (and related) applications to build +# + +#work around some breakages +CVSDATE_minimo=20050401 + +#set some preferred providers: +PREFERRED_PROVIDER_gconf=gconf-dbus + +#specify versions, as the header says :) +PREFERRED_VERSION_libmatchbox ?= "1.7" +PREFERRED_VERSION_matchbox ?= "0.9.1" +PREFERRED_VERSION_matchbox-common ?= "0.9.1" +PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5" +PREFERRED_VERSION_matchbox-panel ?= "0.9.2" +PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" +PREFERRED_VERSION_atk ?= "1.9.0" +PREFERRED_VERSION_cairo ?= "0.5.2" +PREFERRED_VERSION_glib-2.0 ?= "2.6.4" +PREFERRED_VERSION_gtk+ ?= "2.6.7" +PREFERRED_VERSION_pango ?= "1.8.1" +PREFERRED_VERSION_librsvg ?= "2.6.5" +PREFERRED_VERSION_libgpewidget ?= "0.103" +PREFERRED_VERSION_libgpepimc ?= "0.5" +PREFERRED_VERSION_libgpevtype ?= "0.12" +PREFERRED_VERSION_libschedule ?= "0.14" +PREFERRED_VERSION_gpe-icons ?= "0.24" +PREFERRED_VERSION_libgsm ?= "1.0.10" +PREFERRED_VERSION_diet-x11 ?= "6.2.1" +PREFERRED_VERSION_xproto ?= "6.6.2" +PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" +PREFERRED_VERSION_rxvt-unicode ?= "5.3" +PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" +PREFERRED_VERSION_xst ?= "0.14" +#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xhost ?= "0.0cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_gpe-login ?= "0.81" +PREFERRED_VERSION_gpe-session-scripts ?= "0.63" +PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" +PREFERRED_VERSION_gpe-todo ?= "0.54" +PREFERRED_VERSION_gpe-calendar ?= "0.61" +PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" +PREFERRED_VERSION_gpe-contacts ?= "0.41" +PREFERRED_VERSION_gpe-today ?= "0.08" +PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" +PREFERRED_VERSION_dbus ?= "0.23.4" +PREFERRED_VERSION_gpe-bluetooth ?= "0.38" +PREFERRED_VERSION_gpe-su ?= "0.18" +PREFERRED_VERSION_gpe-conf ?= "0.1.24" +PREFERRED_VERSION_gpe-clock ?= "0.20" +PREFERRED_VERSION_gpe-mininet ?= "0.5" +PREFERRED_VERSION_gpe-mixer ?= "0.42" +PREFERRED_VERSION_gpe-shield ?= "0.7" +PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" +PREFERRED_VERSION_gpe-taskmanager ?= "0.18" +PREFERRED_VERSION_keylaunch ?= "2.0.7" +PREFERRED_VERSION_minilite ?= "0.49" +PREFERRED_VERSION_xmonobut ?= "0.4" +PREFERRED_VERSION_gpe-edit ?= "0.29" +PREFERRED_VERSION_gpe-gallery ?= "0.96" +PREFERRED_VERSION_gpe-calculator ?= "0.2" +PREFERRED_VERSION_gpe-package ?= "0.2" +PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" +PREFERRED_VERSION_gpe-terminal ?= "1.1" +PREFERRED_VERSION_gpe-watch ?= "0.10" +PREFERRED_VERSION_gpe-what ?= "0.33" +PREFERRED_VERSION_gpe-filemanager ?= "0.23" +PREFERRED_VERSION_gpe-go ?= "0.05" +PREFERRED_VERSION_gpe-irc ?= "0.07" +PREFERRED_VERSION_gpe-lights ?= "0.13" +#PREFERRED_VERSION_gpe-nmf ?= "0.21" +PREFERRED_VERSION_gpe-othello ?= "0.2-1" +PREFERRED_VERSION_gpe-plucker ?= "0.2" +PREFERRED_VERSION_gpe-tetris ?= "0.6-4" +PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" +PREFERRED_VERSION_xdemineur ?= "2.1.1" +PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" +PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_dillo2 ?= "0.6.6" +PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" +PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" +PREFERRED_VERSION_linphone ?= "0.12.2" +PREFERRED_VERSION_firefox ?= "1.0" +PREFERRED_VERSION_gpe_mini_browser ?= "0.15" diff --git a/conf/distro/unslung-binary-kernel.conf b/conf/distro/unslung-binary-kernel.conf index 20a1e32fa7..3f8dbf3b0c 100644 --- a/conf/distro/unslung-binary-kernel.conf +++ b/conf/distro/unslung-binary-kernel.conf @@ -2,14 +2,14 @@ #@NAME: Unslung #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 -FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross" -FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" -FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" - DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.0-beta" +DISTRO_VERSION = "6.0-alpha" DISTRO_TYPE = "beta" +FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/unstable" +FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/unstable" +FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/unstable" + # pull in the frozen list of bbfiles UNSLUNG_EXTRA_BBFILES ?= "" include conf/distro/freeze.conf diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 06331707fc..482f47881a 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -2,14 +2,14 @@ #@NAME: Unslung #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 -FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross" -FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" -FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" - DISTRO_NAME = "Unslung" -DISTRO_VERSION = "5.6-alpha" +DISTRO_VERSION = "5.6-beta" DISTRO_TYPE = "beta" +FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" +FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" +FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable" + # pull in the frozen list of bbfiles UNSLUNG_EXTRA_BBFILES ?= "" include conf/distro/freeze.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 0c25562644..f9ecedad46 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -7,14 +7,13 @@ IPKG_ARCHS = "all arm ipaqsa h3600" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" -BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa ipaq-boot-params" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" +BOOTSTRAP_EXTRA_DEPENDS = "alsa-driver handhelds-sa ipaq-boot-params" +BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" H3600_MODULES = "\ h3600-asic \ h3600-micro \ h3600-microkbd h3600-stowaway \ -h3600-uda1341 \ hwtimer \ l3-backpaq \ nvrd \ @@ -26,7 +25,6 @@ sa1100-rtc \ sa1100usb-core \ sd-mod \ serial-h3800 \ -uda1341 \ usb-char \ usb-eth" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 1616299ae9..7f56b32282 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -129,6 +129,7 @@ USE_VT = "0" #------------------------------------------------------------------------------- CVSDATE_gnu-config ?= "20050713" CVSDATE_gnu-config-native ?= "20050713" +CVSDATE_ipkg-utils ?= "20050713" CVSDATE_ipkg-utils-native ?= "20050713" CVSDATE_ipkg-link ?= "20050713" diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf index 285ab851ab..f55f2d2554 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/zaurus-clamshell.conf @@ -14,8 +14,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" +GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge" +GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge" include conf/machine/handheld-common.conf diff --git a/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty b/packages/addons/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty +++ b/packages/addons/.mtn2git_empty diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb new file mode 100644 index 0000000000..920ac00d10 --- /dev/null +++ b/packages/addons/devshell.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "Runs a shell in an environment as emitted by BitBake to execute tasks" +LICENSE = "GPL" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" + +inherit autotools pkgconfig + +do_configure() { + : +} + +def devshell_emit_env(o, d, all=False, funcwhitelist=None): + """Emits all items in the data store in a format such that it can be sourced by a shell.""" + + import bb + import bb.data + + env = bb.data.keys(d) + + for e in env: + if bb.data.getVarFlag(e, "func", d): + continue + bb.data.emit_var(e, o, d, all) and o.write('\n') + + for e in env: + if not bb.data.getVarFlag(e, "func", d): + continue + if not funcwhitelist: + bb.data.emit_var(e, o, d) and o.write('\n') + continue + for i in funcwhitelist: + if e.startswith(i): + bb.data.emit_var(e, o, d) and o.write('\n') + break + +python do_compile() { + import os + import os.path + + workdir = bb.data.getVar('WORKDIR', d, 1) + shellfile = os.path.join(workdir, bb.data.expand("${TARGET_PREFIX}${DISTRO}-${MACHINE}-devshell", d)) + + f = open(shellfile, "w") + + # emit variables and shell functions + devshell_emit_env(f, d, False, ["die", "oe", "autotools_do_configure"]) + + f.close() +} + +do_install() { + : +} + +do_stage() { + : +} + +do_package() { + shellfile="${TARGET_PREFIX}${DISTRO}-${MACHINE}-devshell" + + cd ${WORKDIR} + + cp $shellfile tmpfile + echo "#!/bin/bash --rcfile" > $shellfile + sed -e "s:${S}:.:g" -e "s:exit 1:true:" tmpfile >> $shellfile + echo "export PS1='[OE::${TARGET_PREFIX}${DISTRO}-${MACHINE}]:\w\$ '" >> $shellfile + + mkdir -p ${DEPLOY_DIR}/addons + install -m 755 $shellfile ${DEPLOY_DIR}/addons +} diff --git a/packages/alsa/alsa-driver/sa11xx.patch b/packages/alsa/alsa-driver/sa11xx.patch new file mode 100644 index 0000000000..34509b13b0 --- /dev/null +++ b/packages/alsa/alsa-driver/sa11xx.patch @@ -0,0 +1,38 @@ +--- ./alsa-kernel/arm/sa11xx-uda1341.c 2005-06-27 12:59:53.000000000 +0200 ++++ ./alsa-kernel/arm/sa11xx-uda1341.c.orig 2005-06-27 12:59:29.000000000 +0200 +@@ -366,7 +366,7 @@ + DEBUG("\t request id <%s>\n", s->id); + DEBUG("\t request dma_dev = 0x%x \n", s->dma_dev); + if((ret = sa1100_request_dma((s)->dma_dev, (s)->id, callback, s, &((s)->dma_regs)))) +- printk(__FUNCTION__ ": sa1100_request_dma returned %d\n",ret); ++ printk("%s: sa1100_request_dma returned %d\n",__FUNCTION__,ret); + + + +@@ -978,7 +978,7 @@ + switch (req) { + case PM_SUSPEND: /* enter D1-D3 */ + if (card->power_state == SNDRV_CTL_POWER_D3hot){ +- printk(__FUNCTION__ ": exiting eraly from suspend\n"); ++ printk("%s: exiting eraly from suspend\n",__FUNCTION__); + return 0; + } + snd_power_lock(card); +@@ -1002,7 +1002,7 @@ + case PM_RESUME: /* enter D0 */ + + if (card->power_state == SNDRV_CTL_POWER_D0){ +- printk(__FUNCTION__ ": exiting eraly from resume\n"); ++ printk("%s: exiting eraly from resume\n",__FUNCTION__); + return 0; + } + snd_power_lock(card); +@@ -1020,7 +1020,7 @@ + + break; + } +- printk(KERN_DEBUG __FUNCTION__": exiting...\n"); ++ printk(KERN_DEBUG "%s: exiting...\n",__FUNCTION__); + return 0; + + } diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb index bf307d13e2..d8f7dcfa0b 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -1,32 +1,47 @@ DESCRIPTION = "Alsa Drivers" MAINTAINER = "Pigi" -SECTION = "console/utils" +SECTION = "base" LICENSE = "GPL" -#DEPENDS = "alsa-lib" - +PR = "r5" SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \ file://sound.p.patch;patch=1 \ file://h5400.patch;patch=1 \ - file://adriver.h.patch;patch=1 " - -#inherit autotools -#inherit module - -#EXTRA_OECONF = " --with-isapnp=no " -EXTRA_OECONF=" --with-sequencer=no --with-isapnp=no --with-oss=yes --with-cards=${cards} --with-kernel=${STAGING_KERNEL_DIR} --with-kernel-version=${KERNEL_VERSION} --host=arm-linux" -#EXTRA_OECONF = " /ext/ambient/tmp/work/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4-r5/kernel/ " - + file://sa11xx.patch;patch=1 \ + file://adriver.h.patch;patch=1" + +inherit autotools module + +EXTRA_OECONF = "--with-sequencer=yes \ + --with-isapnp=no \ + --with-oss=yes \ + --with-kernel=${STAGING_KERNEL_DIR} \ + --with-kernel-version=${KERNEL_VERSION}" + +PACKAGES =+ "${PN}-midi ${PN}-misc" +FILES_${PN} = "/lib/modules/*/misc/snd* \ + ${sysconfdir}/modutils/*" +midi_modules = "snd-seq-midi-emul.o \ + snd-seq-midi-event.o \ + snd-seq-midi.o \ + snd-seq-virmidi.o \ + snd-seq-oss.o" +FILES_${PN}-midi = "${@' '.join(map ((lambda x: '/lib/modules/*/misc/%s' % x), bb.data.getVar('midi_modules', d).split()))}" +misc_modules = "snd-gus-synth.o \ + snd-emu8000-synth.o \ + snd-emux-synth.o \ + snd-ainstr-fm.o \ + snd-ainstr-gf1.o \ + snd-ainstr-iw.o \ + snd-ainstr-simple.o" +FILES_${PN}-misc = "${@' '.join(map ((lambda x: '/lib/modules/*/misc/%s' % x), bb.data.getVar('misc_modules', d).split()))}" + +# put in-kernel headers first in the include search path. +# without this all configure checks fail +CFLAGS =+ "-I${STAGING_KERNEL_DIR}/include" do_configure() { -VERS=`grep "^VERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` -PATLEV=`grep "^PATCHLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` -SBLEV=`grep "^SUBLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` -EXVER=`grep "^EXTRAVERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` - -KERNEL_VERSION=$VERS.$PATLEV.$SBLEV$EXVER - cards= if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then cards="$cards,sa11xx-uda1341" @@ -38,13 +53,10 @@ if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then fi cards="$cards,bluez-sco,pdaudiocf" - configure ${EXTRA_OECONF} - #./config.ipaq ${STAGING_KERNEL_DIR} - + oe_runconf --with-cards=${cards} } - do_install() { if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then @@ -53,23 +65,13 @@ fi if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then familiar_arch=ipaqpxa fi -extra_modules="snd-gus-synth.o snd-emu8000-synth.o snd-emux-synth.o \ - snd-ainstr-fm.o snd-ainstr-gf1.o snd-ainstr-iw.o snd-ainstr-simple.o \ - snd-seq-midi-emul.o snd-seq-midi-event.o snd-seq-midi.o snd-seq-virmidi.o snd-seq-oss.o" fakeroot make -k NODEPMOD=yes DESTDIR=${D} install; - for i in ${extra_modules}; - do rm -f ${D}/lib/modules/*/misc/$i; - done - - if [ -d ${D}/${sysconfdir}/modutils/ ] ; then - rm -r ${D}/${sysconfdir}/modutils/ ; + if [ -d ${D}${sysconfdir}/modutils/ ] ; then + rm -r ${D}${sysconfdir}/modutils/ ; fi - mkdir ${D}/${sysconfdir}/modutils/ - cp familiar/alsa-modules-${familiar_arch} ${D}/${sysconfdir}/modutils/ + mkdir -p ${D}${sysconfdir}/modutils/ + cp familiar/alsa-modules-${familiar_arch} ${D}${sysconfdir}/modutils/ } -#FILES_alsa-driver = "/lib/modules/${KERNEL_VERSION}/misc/snd* /${sysconfdir}/init.d/ /${sysconfdir}" -FILES_${PN} = "/lib/modules/*/misc/snd* ${sysconfdir}/modutils/* " - diff --git a/packages/nonworking/alsa-driver/.mtn2git_empty b/packages/apache/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/alsa-driver/.mtn2git_empty +++ b/packages/apache/.mtn2git_empty diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb new file mode 100644 index 0000000000..882b7f2c71 --- /dev/null +++ b/packages/apache/apache_2.0.54.bb @@ -0,0 +1,92 @@ +MAINTAINER="David Karlstrom <daka@nslu2-linux.org>" +SECTION = "net" +DEPENDS = "openssl expat pcre" + +PR = "r2" + +# ------------------------------------------ +# NOTE: This package is currently only meant +# to be built nativly on the target device +# ------------------------------------------ + +SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz \ + " + +S = "${WORKDIR}/httpd-${PV}" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "httpd" +INITSCRIPT_PARAMS = "defaults 91 20" + +CONFFILES_${PN} = "${sysconfdir}/apache/httpd.conf \ + ${sysconfdir}/apache/ssl.conf \ + ${sysconfdir}/apache/magic \ + ${sysconfdir}/apache/mime.types \ + ${datadir}/apache/htdocs/index.html \ + ${datadir}/apache/htdocs/apache_pb.gif \ + " + +PACKAGES = "libaprutil libapr apache-dev apache-doc apache" +FILES_libapr = "${libdir}/libapr*.so.0* ${libdir}/apr.exp" +FILES_libaprutil = "${libdir}/libaprutil*.so.0* ${libdir}/aprutil.exp" + +FILES_apache-dev_prepend = "${datadir}/apache/build ${bindir}/apr-config ${bindir}/apu-config " +FILES_apache-doc_prepend = "${datadir}/apache/manual " + +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ + ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + ${datadir}/apache" + +CFLAGS_append = " -DPATH_MAX=4096" +CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " +EXTRA_OECONF = "--enable-ssl \ + --with-ssl=${STAGING_LIBDIR}/.. \ + --enable-dav \ + --enable-dav-fs \ + --with-dbm=sdbm \ + --with-berkeley-db=no \ + --localstatedir=${localstatedir}/log/apache \ + --with-gdbm=no \ + --with-ndbm=no \ + --datadir=${datadir}/apache \ + --sysconfdir=${sysconfdir}/apache \ + " + +export LD_LIBRARY_PATH=${STAGING_LIBDIR} + +do_configure () { + # Looks like rebuilding configure doesn't work, so we are skipping + # that and are just using the shipped one + oe_runconf +} + +do_install_append () { + set -x + rm ${D}/${datadir}/apache/htdocs/index* + rm ${D}/${datadir}/apache/htdocs/apache_pb2.* + rm ${D}/${datadir}/apache/htdocs/apache_pb.png + install -m 0644 ${FILESDIR}/index.html ${D}/${datadir}/apache/htdocs/ + + install -d ${D}/${sysconfdir}/init.d + cat ${FILESDIR}/init | \ + sed -e 's,/usr/sbin/,${sbindir}/,g' \ + -e 's,/usr/bin/,${bindir}/,g' \ + -e 's,/usr/lib,${libdir}/,g' \ + -e 's,/etc/,${sysconfdir}/,g' \ + -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/httpd + chmod 755 ${D}/${sysconfdir}/init.d/httpd + + install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf + + rm ${D}/${libdir}/libexpat.* +} + +python () { + # Don't build apache unless we are building nativly + target = bb.data.getVar("TARGET_ARCH", d, 1) + build = bb.data.getVar("BUILD_ARCH", d, 1) + if target != build: + raise bb.parse.SkipPackage("Apache will only build nativly (TARGET_ARCH == BUILD_ARCH)") +} + diff --git a/packages/nonworking/emotion/.mtn2git_empty b/packages/apache/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/emotion/.mtn2git_empty +++ b/packages/apache/files/.mtn2git_empty diff --git a/packages/apache/files/httpd.conf b/packages/apache/files/httpd.conf new file mode 100644 index 0000000000..e816549600 --- /dev/null +++ b/packages/apache/files/httpd.conf @@ -0,0 +1,1032 @@ +# +# Based upon the NCSA server configuration files originally by Rob McCool. +# +# This is the main Apache server configuration file. It contains the +# configuration directives that give the server its instructions. +# See <URL:http://httpd.apache.org/docs-2.0/> for detailed information about +# the directives. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# The configuration directives are grouped into three basic sections: +# 1. Directives that control the operation of the Apache server process as a +# whole (the 'global environment'). +# 2. Directives that define the parameters of the 'main' or 'default' server, +# which responds to requests that aren't handled by a virtual host. +# These directives also provide default values for the settings +# of all virtual hosts. +# 3. Settings for virtual hosts, which allow Web requests to be sent to +# different IP addresses or hostnames and have them handled by the +# same Apache server process. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "/var/logs/foo.log" +# with ServerRoot set to "/usr" will be interpreted by the +# server as "/usr//var/logs/foo.log". +# + +### Section 1: Global Environment +# +# The directives in this section affect the overall operation of Apache, +# such as the number of concurrent requests it can handle or where it +# can find its configuration files. +# + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# NOTE! If you intend to place this on an NFS (or otherwise network) +# mounted filesystem then please read the LockFile documentation (available +# at <URL:http://httpd.apache.org/docs-2.0/mod/mpm_common.html#lockfile>); +# you will save yourself a lot of trouble. +# +# Do NOT add a slash at the end of the directory path. +# +ServerRoot "/usr" + +# +# The accept serialization lock file MUST BE STORED ON A LOCAL DISK. +# +<IfModule !mpm_winnt.c> +<IfModule !mpm_netware.c> +#LockFile /var/log/apache/accept.lock +</IfModule> +</IfModule> + +# +# ScoreBoardFile: File used to store internal server process information. +# If unspecified (the default), the scoreboard will be stored in an +# anonymous shared memory segment, and will be unavailable to third-party +# applications. +# If specified, ensure that no two invocations of Apache share the same +# scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK. +# +<IfModule !mpm_netware.c> +<IfModule !perchild.c> +#ScoreBoardFile /var/log/apache/apache_runtime_status +</IfModule> +</IfModule> + + +# +# PidFile: The file in which the server should record its process +# identification number when it starts. +# +<IfModule !mpm_netware.c> +PidFile /var/log/apache/httpd.pid +</IfModule> + +# +# Timeout: The number of seconds before receives and sends time out. +# +Timeout 300 + +# +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +# +KeepAlive On + +# +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +# +MaxKeepAliveRequests 100 + +# +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +# +KeepAliveTimeout 15 + +## +## Server-Pool Size Regulation (MPM specific) +## + +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves +<IfModule prefork.c> +StartServers 5 +MinSpareServers 5 +MaxSpareServers 10 +MaxClients 150 +MaxRequestsPerChild 0 +</IfModule> + +# worker MPM +# StartServers: initial number of server processes to start +# MaxClients: maximum number of simultaneous client connections +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxRequestsPerChild: maximum number of requests a server process serves +<IfModule worker.c> +StartServers 2 +MaxClients 150 +MinSpareThreads 25 +MaxSpareThreads 75 +ThreadsPerChild 25 +MaxRequestsPerChild 0 +</IfModule> + +# perchild MPM +# NumServers: constant number of server processes +# StartThreads: initial number of worker threads in each server process +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# MaxThreadsPerChild: maximum number of worker threads in each server process +# MaxRequestsPerChild: maximum number of connections per server process +<IfModule perchild.c> +NumServers 5 +StartThreads 5 +MinSpareThreads 5 +MaxSpareThreads 10 +MaxThreadsPerChild 20 +MaxRequestsPerChild 0 +</IfModule> + +# WinNT MPM +# ThreadsPerChild: constant number of worker threads in the server process +# MaxRequestsPerChild: maximum number of requests a server process serves +<IfModule mpm_winnt.c> +ThreadsPerChild 250 +MaxRequestsPerChild 0 +</IfModule> + +# BeOS MPM +# StartThreads: how many threads do we initially spawn? +# MaxClients: max number of threads we can have (1 thread == 1 client) +# MaxRequestsPerThread: maximum number of requests each thread will process +<IfModule beos.c> +StartThreads 10 +MaxClients 50 +MaxRequestsPerThread 10000 +</IfModule> + +# NetWare MPM +# ThreadStackSize: Stack size allocated for each worker thread +# StartThreads: Number of worker threads launched at server startup +# MinSpareThreads: Minimum number of idle threads, to handle request spikes +# MaxSpareThreads: Maximum number of idle threads +# MaxThreads: Maximum number of worker threads alive at the same time +# MaxRequestsPerChild: Maximum number of requests a thread serves. It is +# recommended that the default value of 0 be set for this +# directive on NetWare. This will allow the thread to +# continue to service requests indefinitely. +<IfModule mpm_netware.c> +ThreadStackSize 65536 +StartThreads 250 +MinSpareThreads 25 +MaxSpareThreads 250 +MaxThreads 1000 +MaxRequestsPerChild 0 +MaxMemFree 100 +</IfModule> + +# OS/2 MPM +# StartServers: Number of server processes to maintain +# MinSpareThreads: Minimum number of idle threads per process, +# to handle request spikes +# MaxSpareThreads: Maximum number of idle threads per process +# MaxRequestsPerChild: Maximum number of connections per server process +<IfModule mpmt_os2.c> +StartServers 2 +MinSpareThreads 5 +MaxSpareThreads 10 +MaxRequestsPerChild 0 +</IfModule> + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the <VirtualHost> +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) +# +#Listen 12.34.56.78:80 + +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# + +# +# ExtendedStatus controls whether Apache will generate "full" status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the "server-status" handler is called. The default is Off. +# +#ExtendedStatus On + +### Section 2: 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# <VirtualHost> definition. These values also provide defaults for +# any <VirtualHost> containers you may define later in the file. +# +# All of these directives may appear inside <VirtualHost> containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +<IfModule !mpm_winnt.c> +<IfModule !mpm_netware.c> +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# . On SCO (ODT 3) use "User nouser" and "Group nogroup". +# . On HPUX you may not be able to use shared memory as nobody, and the +# suggested workaround is to create a user www and use that user. +# NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET) +# when the value of (unsigned)Group is above 60000; +# don't use Group #-1 on these systems! +# +User nobody +Group #-1 +</IfModule> +</IfModule> + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If this is not set to valid DNS name for your host, server-generated +# redirections will not work. See also the UseCanonicalName directive. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# You will have to access it by its address anyway, and this will make +# redirections work in a sensible way. +# +#ServerName www.example.com:80 + +# +# UseCanonicalName: Determines how Apache constructs self-referencing +# URLs and the SERVER_NAME and SERVER_PORT variables. +# When set "Off", Apache will use the Hostname and Port supplied +# by the client. When set "On", Apache will use the value of the +# ServerName directive. +# +UseCanonicalName Off + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/usr/share/apache/htdocs" + +# +# Each directory to which Apache has access can be configured with respect +# to which services and features are allowed and/or disabled in that +# directory (and its subdirectories). +# +# First, we configure the "default" to be a very restrictive set of +# features. +# +<Directory /> + Options FollowSymLinks + AllowOverride None +</Directory> + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# This should be changed to whatever you set DocumentRoot to. +# +<Directory "/usr/share/apache/htdocs"> + +# +# Possible values for the Options directive are "None", "All", +# or any combination of: +# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews +# +# Note that "MultiViews" must be named *explicitly* --- "Options All" +# doesn't give it to you. +# +# The Options directive is both complicated and important. Please see +# http://httpd.apache.org/docs-2.0/mod/core.html#options +# for more information. +# + Options Indexes FollowSymLinks + +# +# AllowOverride controls what directives may be placed in .htaccess files. +# It can be "All", "None", or any combination of the keywords: +# Options FileInfo AuthConfig Limit +# + AllowOverride None + +# +# Controls who can get stuff from this server. +# + Order allow,deny + Allow from all + +</Directory> + +# +# UserDir: The name of the directory that is appended onto a user's home +# directory if a ~user request is received. +# +UserDir public_html + +# +# Control access to UserDir directories. The following is an example +# for a site where these directories are restricted to read-only. +# +#<Directory /home/*/public_html> +# AllowOverride FileInfo AuthConfig Limit Indexes +# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec +# <Limit GET POST OPTIONS PROPFIND> +# Order allow,deny +# Allow from all +# </Limit> +# <LimitExcept GET POST OPTIONS PROPFIND> +# Order deny,allow +# Deny from all +# </LimitExcept> +#</Directory> + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# +# The index.html.var file (a type-map) is used to deliver content- +# negotiated documents. The MultiViews Option can be used for the +# same purpose, but it is much slower. +# +DirectoryIndex index.html index.html.var + +# +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +# +AccessFileName .htaccess + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# +<Files ~ "^\.ht"> + Order allow,deny + Deny from all +</Files> + +# +# TypesConfig describes where the mime.types file (or equivalent) is +# to be found. +# +TypesConfig /etc/apache/mime.types + +# +# DefaultType is the default MIME type the server will use for a document +# if it cannot otherwise determine one, such as from filename extensions. +# If your server contains mostly text or HTML documents, "text/plain" is +# a good value. If most of your content is binary, such as applications +# or images, you may want to use "application/octet-stream" instead to +# keep browsers from trying to display binary files as though they are +# text. +# +DefaultType text/plain + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +<IfModule mod_mime_magic.c> + MIMEMagicFile /etc/apache/magic +</IfModule> + +# +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +# +HostnameLookups Off + +# +# EnableMMAP: Control whether memory-mapping is used to deliver +# files (assuming that the underlying OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. On some systems, turning it off (regardless of +# filesystem) can improve performance; for details, please see +# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap +# +#EnableMMAP off + +# +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile +# +#EnableSendfile off + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a <VirtualHost> +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a <VirtualHost> +# container, that host's errors will be logged there and not here. +# +ErrorLog /var/log/apache/error_log + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + +# +# The following directives define some format nicknames for use with +# a CustomLog directive (see below). +# +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +# You need to enable mod_logio.c to use %I and %O +#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + +# +# The location and format of the access logfile (Common Logfile Format). +# If you do not define any access logfiles within a <VirtualHost> +# container, they will be logged here. Contrariwise, if you *do* +# define per-<VirtualHost> access logfiles, transactions will be +# logged therein and *not* in this file. +# +CustomLog /var/log/apache/access_log common + +# +# If you would like to have agent and referer logfiles, uncomment the +# following directives. +# +#CustomLog /var/log/apache/referer_log referer +#CustomLog /var/log/apache/agent_log agent + +# +# If you prefer a single logfile with access, agent, and referer information +# (Combined Logfile Format) you can use the following directive. +# +#CustomLog /var/log/apache/access_log combined + +# +# ServerTokens +# This directive configures what you return as the Server HTTP response +# Header. The default is 'Full' which sends information about the OS-Type +# and compiled in modules. +# Set to one of: Full | OS | Minor | Minimal | Major | Prod +# where Full conveys the most information, and Prod the least. +# +ServerTokens Full + +# +# Optionally add a line containing the server version and virtual host +# name to server-generated pages (internal error documents, FTP directory +# listings, mod_status and mod_info output etc., but not CGI generated +# documents or custom error documents). +# Set to "EMail" to also include a mailto: link to the ServerAdmin. +# Set to one of: On | Off | EMail +# +ServerSignature On + +# +# Aliases: Add here as many aliases as you need (with no limit). The format is +# Alias fakename realname +# +# Note that if you include a trailing / on fakename then the server will +# require it to be present in the URL. So "/icons" isn't aliased in this +# example, only "/icons/". If the fakename is slash-terminated, then the +# realname must also be slash terminated, and if the fakename omits the +# trailing slash, the realname must also omit it. +# +# We include the /icons/ alias for FancyIndexed directory listings. If you +# do not use FancyIndexing, you may comment this out. +# +Alias /icons/ "/usr/share/apache/icons/" + +<Directory "/usr/share/apache/icons"> + Options Indexes MultiViews + AllowOverride None + Order allow,deny + Allow from all +</Directory> + +# +# This should be changed to the ServerRoot/manual/. The alias provides +# the manual, even if you choose to move your DocumentRoot. You may comment +# this out if you do not care for the documentation. +# +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "/usr/share/apache/manual$1" + +<Directory "/usr/share/apache/manual"> + Options Indexes + AllowOverride None + Order allow,deny + Allow from all + + <Files *.html> + SetHandler type-map + </Files> + + SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1 + RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2 +</Directory> + +# +# ScriptAlias: This controls which directories contain server scripts. +# ScriptAliases are essentially the same as Aliases, except that +# documents in the realname directory are treated as applications and +# run by the server when requested rather than as documents sent to the client. +# The same rules about trailing "/" apply to ScriptAlias directives as to +# Alias. +# +ScriptAlias /cgi-bin/ "/usr/share/apache/cgi-bin/" + +<IfModule mod_cgid.c> +# +# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path> +# for setting UNIX socket for communicating with cgid. +# +#Scriptsock /var/log/apache/cgisock +</IfModule> + +# +# "/usr/share/apache/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# +<Directory "/usr/share/apache/cgi-bin"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + +# +# Redirect allows you to tell clients about documents which used to exist in +# your server's namespace, but do not anymore. This allows you to tell the +# clients where to look for the relocated document. +# Example: +# Redirect permanent /foo http://www.example.com/bar + +# +# Directives controlling the display of server-generated directory listings. +# + +# +# IndexOptions: Controls the appearance of server-generated directory +# listings. +# +IndexOptions FancyIndexing VersionSort + +# +# AddIcon* directives tell the server which icon to show for different +# files or filename extensions. These are only displayed for +# FancyIndexed directories. +# +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip + +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* + +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +AddIcon /icons/bomb.gif core + +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ + +# +# DefaultIcon is which icon to show for files which do not have an icon +# explicitly set. +# +DefaultIcon /icons/unknown.gif + +# +# AddDescription allows you to place a short description after a file in +# server-generated indexes. These are only displayed for FancyIndexed +# directories. +# Format: AddDescription "description" filename +# +#AddDescription "GZIP compressed document" .gz +#AddDescription "tar archive" .tar +#AddDescription "GZIP compressed tar archive" .tgz + +# +# ReadmeName is the name of the README file the server will look for by +# default, and append to directory listings. +# +# HeaderName is the name of a file which should be prepended to +# directory indexes. +ReadmeName README.html +HeaderName HEADER.html + +# +# IndexIgnore is a set of filenames which directory indexing should ignore +# and not include in the listing. Shell-style wildcarding is permitted. +# +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t + +# +# DefaultLanguage and AddLanguage allows you to specify the language of +# a document. You can then use content negotiation to give a browser a +# file in a language the user can understand. +# +# Specify a default language. This means that all data +# going out without a specific language tag (see below) will +# be marked with this one. You probably do NOT want to set +# this unless you are sure it is correct for all cases. +# +# * It is generally better to not mark a page as +# * being a certain language than marking it with the wrong +# * language! +# +# DefaultLanguage nl +# +# Note 1: The suffix does not have to be the same as the language +# keyword --- those with documents in Polish (whose net-standard +# language code is pl) may wish to use "AddLanguage pl .po" to +# avoid the ambiguity with the common suffix for perl scripts. +# +# Note 2: The example entries below illustrate that in some cases +# the two character 'Language' abbreviation is not identical to +# the two character 'Country' code for its country, +# E.g. 'Danmark/dk' versus 'Danish/da'. +# +# Note 3: In the case of 'ltz' we violate the RFC by using a three char +# specifier. There is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) +# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) +# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) +# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) +# Norwegian (no) - Polish (pl) - Portugese (pt) +# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) +# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) +# +AddLanguage ca .ca +AddLanguage cs .cz .cs +AddLanguage da .dk +AddLanguage de .de +AddLanguage el .el +AddLanguage en .en +AddLanguage eo .eo +AddLanguage es .es +AddLanguage et .et +AddLanguage fr .fr +AddLanguage he .he +AddLanguage hr .hr +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ko .ko +AddLanguage ltz .ltz +AddLanguage nl .nl +AddLanguage nn .nn +AddLanguage no .no +AddLanguage pl .po +AddLanguage pt .pt +AddLanguage pt-BR .pt-br +AddLanguage ru .ru +AddLanguage sv .sv +AddLanguage zh-CN .zh-cn +AddLanguage zh-TW .zh-tw + +# +# LanguagePriority allows you to give precedence to some languages +# in case of a tie during content negotiation. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You probably want to change this. +# +LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW + +# +# ForceLanguagePriority allows you to serve a result page rather than +# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) +# [in case no accepted languages matched the available variants] +# +ForceLanguagePriority Prefer Fallback + +# +# Commonly used filename extensions to character sets. You probably +# want to avoid clashes with the language extensions, unless you +# are good at carefully testing your setup after each change. +# See http://www.iana.org/assignments/character-sets for the +# official list of charset names and their respective RFCs. +# +AddCharset ISO-8859-1 .iso8859-1 .latin1 +AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen +AddCharset ISO-8859-3 .iso8859-3 .latin3 +AddCharset ISO-8859-4 .iso8859-4 .latin4 +AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru +AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb +AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk +AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb +AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk +AddCharset ISO-2022-JP .iso2022-jp .jis +AddCharset ISO-2022-KR .iso2022-kr .kis +AddCharset ISO-2022-CN .iso2022-cn .cis +AddCharset Big5 .Big5 .big5 +# For russian, more than one charset is used (depends on client, mostly): +AddCharset WINDOWS-1251 .cp-1251 .win-1251 +AddCharset CP866 .cp866 +AddCharset KOI8-r .koi8-r .koi8-ru +AddCharset KOI8-ru .koi8-uk .ua +AddCharset ISO-10646-UCS-2 .ucs2 +AddCharset ISO-10646-UCS-4 .ucs4 +AddCharset UTF-8 .utf8 + +# The set below does not map to a specific (iso) standard +# but works on a fairly wide range of browsers. Note that +# capitalization actually matters (it should not, but it +# does for some browsers). +# +# See http://www.iana.org/assignments/character-sets +# for a list of sorts. But browsers support few. +# +AddCharset GB2312 .gb2312 .gb +AddCharset utf-7 .utf7 +AddCharset utf-8 .utf8 +AddCharset big5 .big5 .b5 +AddCharset EUC-TW .euc-tw +AddCharset EUC-JP .euc-jp +AddCharset EUC-KR .euc-kr +AddCharset shift_jis .sjis + +# +# AddType allows you to add to or override the MIME configuration +# file mime.types for specific file types. +# +#AddType application/x-tar .tgz +# +# AddEncoding allows you to have certain browsers uncompress +# information on the fly. Note: Not all browsers support this. +# Despite the name similarity, the following Add* directives have nothing +# to do with the FancyIndexing customization directives above. +# +#AddEncoding x-compress .Z +#AddEncoding x-gzip .gz .tgz +# +# If the AddEncoding directives above are commented-out, then you +# probably should define those extensions to indicate media types: +# +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz + +# +# AddHandler allows you to map certain file extensions to "handlers": +# actions unrelated to filetype. These can be either built into the server +# or added with the Action directive (see below) +# +# To use CGI scripts outside of ScriptAliased directories: +# (You will also need to add "ExecCGI" to the "Options" directive.) +# +#AddHandler cgi-script .cgi + +# +# For files that include their own HTTP headers: +# +#AddHandler send-as-is asis + +# +# For server-parsed imagemap files: +# +#AddHandler imap-file map + +# +# For type maps (negotiated resources): +# (This is enabled by default to allow the Apache "It Worked" page +# to be distributed in multiple languages.) +# +AddHandler type-map var + +# +# Filters allow you to process content before it is sent to the client. +# +# To parse .shtml files for server-side includes (SSI): +# (You will also need to add "Includes" to the "Options" directive.) +# +#AddType text/html .shtml +#AddOutputFilter INCLUDES .shtml + +# +# Action lets you define media types that will execute a script whenever +# a matching file is called. This eliminates the need for repeated URL +# pathnames for oft-used CGI file processors. +# Format: Action media/type /cgi-script/location +# Format: Action handler-name /cgi-script/location +# + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# Putting this all together, we can internationalize error responses. +# +# We use Alias to redirect any /error/HTTP_<error>.html.var response to +# our collection of by-error message multi-language collections. We use +# includes to substitute the appropriate text. +# +# You can modify the messages' appearance without changing any of the +# default HTTP_<error>.html.var files by adding the line: +# +# Alias /error/include/ "/your/include/path/" +# +# which allows you to create your own set of files by starting with the +# /usr/share/apache/error/include/ files and copying them to /your/include/path/, +# even on a per-VirtualHost basis. The default include files will display +# your Apache version number and your ServerAdmin email address regardless +# of the setting of ServerSignature. +# +# The internationalized error documents require mod_alias, mod_include +# and mod_negotiation. To activate them, uncomment the following 30 lines. + +# Alias /error/ "/usr/share/apache/error/" +# +# <Directory "/usr/share/apache/error"> +# AllowOverride None +# Options IncludesNoExec +# AddOutputFilter Includes html +# AddHandler type-map var +# Order allow,deny +# Allow from all +# LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr +# ForceLanguagePriority Prefer Fallback +# </Directory> +# +# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var +# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var +# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var +# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var +# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var +# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var +# ErrorDocument 410 /error/HTTP_GONE.html.var +# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var +# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var +# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var +# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var +# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var +# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var +# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var +# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var +# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var +# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var + + +# +# The following directives modify normal HTTP response behavior to +# handle known problems with browser implementations. +# +BrowserMatch "Mozilla/2" nokeepalive +BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 +BrowserMatch "RealPlayer 4\.0" force-response-1.0 +BrowserMatch "Java/1\.0" force-response-1.0 +BrowserMatch "JDK/1\.0" force-response-1.0 + +# +# The following directive disables redirects on non-GET requests for +# a directory that does not include the trailing slash. This fixes a +# problem with Microsoft WebFolders which does not appropriately handle +# redirects for folders with DAV methods. +# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. +# +BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully +BrowserMatch "^WebDrive" redirect-carefully +BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully +BrowserMatch "^gnome-vfs" redirect-carefully + +# +# Allow server status reports generated by mod_status, +# with the URL of http://servername/server-status +# Change the ".example.com" to match your domain to enable. +# +#<Location /server-status> +# SetHandler server-status +# Order deny,allow +# Deny from all +# Allow from .example.com +#</Location> + +# +# Allow remote server configuration reports, with the URL of +# http://servername/server-info (requires that mod_info.c be loaded). +# Change the ".example.com" to match your domain to enable. +# +#<Location /server-info> +# SetHandler server-info +# Order deny,allow +# Deny from all +# Allow from .example.com +#</Location> + + +# +# Bring in additional module-specific configurations +# +<IfModule mod_ssl.c> + Include /etc/apache/ssl.conf +</IfModule> + + +### Section 3: Virtual Hosts +# +# VirtualHost: If you want to maintain multiple domains/hostnames on your +# machine you can setup VirtualHost containers for them. Most configurations +# use only name-based virtual hosts so the server doesn't need to worry about +# IP addresses. This is indicated by the asterisks in the directives below. +# +# Please see the documentation at +# <URL:http://httpd.apache.org/docs-2.0/vhosts/> +# for further details before you try to setup virtual hosts. +# +# You may use the command line option '-S' to verify your virtual host +# configuration. + +# +# Use name-based virtual hosting. +# +#NameVirtualHost *:80 + +# +# VirtualHost example: +# Almost any Apache directive may go into a VirtualHost container. +# The first VirtualHost section is used for requests without a known +# server name. +# +#<VirtualHost *:80> +# ServerAdmin webmaster@dummy-host.example.com +# DocumentRoot /www/docs/dummy-host.example.com +# ServerName dummy-host.example.com +# ErrorLog /var/log/apache/dummy-host.example.com-error_log +# CustomLog /var/log/apache/dummy-host.example.com-access_log common +#</VirtualHost> diff --git a/packages/apache/files/index.html b/packages/apache/files/index.html new file mode 100644 index 0000000000..e445e2cd63 --- /dev/null +++ b/packages/apache/files/index.html @@ -0,0 +1,42 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>Test Page for Apache Installation</title> +</head> +<!-- Background white, links blue (unvisited), navy (visited), red +(active) --> +<body bgcolor="#FFFFFF" text="#000000" link="#0000FF" +vlink="#000080" alink="#FF0000"> +<h3>The installation of Apache was successfull!</h3> +<p>Welcome to the default index.html for the +<a href="http://www.openembedded.org">OpenEmbedded</a> Apache package</p> +<hr> +<p>If you can see this, it means that the installation of the <a +href="http://www.apache.org/foundation/preFAQ.html">Apache web +server</a> software on this system was successful. You may now add +content to this directory and replace this page.</p> + +<hr width="50%" size="8" /> +<h2 align="center">Seeing this instead of the website you +expected?</h2> + +<p>This page is here because the site administrator has changed the +configuration of this web server. Please <strong>contact the person +responsible for maintaining this server with questions.</strong> +The Apache Software Foundation, which wrote the web server software +this site administrator is using, has nothing to do with +maintaining this site and cannot help resolve configuration +issues.</p> + +<hr width="50%" size="8" /> +<p>The Apache <a href="manual/">documentation</a> is included +in the optional apache-doc package.</p> + +<p>You are free to use the image below on an Apache-powered web +server. Thanks for using Apache!</p> + +<div align="center"><img src="apache_pb.gif" alt="" /></div> +</body> +</html> + diff --git a/packages/apache/files/init b/packages/apache/files/init new file mode 100755 index 0000000000..46dae0395f --- /dev/null +++ b/packages/apache/files/init @@ -0,0 +1,73 @@ +#!/bin/sh +# +# apache Start the apache HTTP server. +# + +NAME=apache +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/usr/sbin/httpd +SUEXEC=/usr/lib/apache/suexec +PIDFILE=/var/run/$NAME.pid +CONF=/etc/apache/httpd.conf +APACHECTL=/usr/sbin/apachectl + +trap "" 1 +export LANG=C +export PATH + +test -f $DAEMON || exit 0 +test -f $APACHECTL || exit 0 + +# ensure we don't leak environment vars into apachectl +APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL" + +if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF +then + exit 0 +fi + +case "$1" in + start) + echo -n "Starting web server: $NAME" + start-stop-daemon --start --quiet --background --exec $DAEMON + ;; + + stop) + echo -n "Stopping web server: $NAME" + start-stop-daemon --stop --signal 3 --quiet --exec $DAEMON + ;; + + reload) + echo -n "Reloading $NAME configuration" + start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON + ;; + + reload-modules) + echo -n "Reloading $NAME modules" + $0 stop + $0 start + ;; + + restart) + $0 reload-modules + exit $? + ;; + + force-reload) + $0 reload-modules + exit $? + ;; + + *) + echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}" + exit 1 + ;; +esac + +if [ $? == 0 ]; then + echo . + exit 0 +else + echo failed + exit 1 +fi diff --git a/packages/nonworking/esmart/.mtn2git_empty b/packages/apr/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/esmart/.mtn2git_empty +++ b/packages/apr/.mtn2git_empty diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb new file mode 100644 index 0000000000..e9f9587420 --- /dev/null +++ b/packages/apr/apr-util_1.1.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Apache Portable Runtime (APR) companion library" +SECTION = "libs" +DEPENDS = "apr expat gdbm" +MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>" +LICENSE = "Apache License, Version 2.0" + +PR = "r0" + +# apache mirrors? +SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz" + +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" + +inherit autotools lib_package binconfig + +do_configure() { + oe_runconf +} + +do_stage() { + oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR} +} diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb new file mode 100644 index 0000000000..f67f31005e --- /dev/null +++ b/packages/apr/apr_1.1.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Apache Portable Runtime (APR) library" +SECTION = "libs" +MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>" +LICENSE = "Apache License, Version 2.0" + +PR = "r0" + +# apache mirrors? +SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2" + +inherit autotools lib_package binconfig + +do_configure() { + oe_runconf +} + +do_stage() { + oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR} +} diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb index 5e56c4787a..1c8f1faa9c 100644 --- a/packages/at76c503a/at76c503a-modules_cvs.bb +++ b/packages/at76c503a/at76c503a-modules_cvs.bb @@ -3,33 +3,18 @@ LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \ file://makefile.cc.patch;patch=1" S = "${WORKDIR}/at76c503a" -PR = "r2" +PR = "r4" PV = "0.0cvs${CVSDATE}" inherit module MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \ at76c505-rfmd at76c503-i3863 at76c505-rfmd2958" -MODULES_EXTENSION = "o" -MODULES_EXTENSION_kernel26 = "ko" - -pkg_postinst() { -#!/bin/sh -if [ "x$D" != "x" ]; then - exit 1 -fi -update-modules || true -} - -pkg_postrm() { -#!/bin/sh -update-modules || true -} do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ for i in ${MODULES}; do - install -m 0644 $i.${MODULES_EXTENSION} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ + install -m 0644 $i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ done if [ "${MACHINE}" = "h3900" ]; then install -d ${D}${sysconfdir}/modutils diff --git a/packages/uicmoc/uicmoc4-native-4.0.0/.mtn2git_empty b/packages/avetanabt/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc4-native-4.0.0/.mtn2git_empty +++ b/packages/avetanabt/.mtn2git_empty diff --git a/packages/avetanabt/avetanabt_svn.bb b/packages/avetanabt/avetanabt_svn.bb new file mode 100644 index 0000000000..08adcbbdfd --- /dev/null +++ b/packages/avetanabt/avetanabt_svn.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)" +SECTION = "devel" +DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath" +#RDEPENDS = "bluez-utils" +# Matthias Ringwald <mringwal@inf.ethz.ch> was helping me in the first phase. Thanks. +MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>" +LICENSE = "GPL" +HOMEPAGE = "http://sourceforge.net/projects/avetanabt/" + +PV = "0.0cvs${CVSDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt" + +S = "${WORKDIR}/avetanabt" + +PACKAGES = "${PN}" +FILES_${PN} = "${libdir}/libavetanaBT.so ${datadir}/avetanabt/avetanaBT.jar" + +do_compile() { + + # doing nearly the same as in Makefile written... + + mkdir -p build + rm -fr build/* + + # javac -> jikes + ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list + ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list + + # jar -> fastjar + cd build + ${STAGING_BINDIR}/fastjar -cf ../avetanaBT.jar de javax com + cd .. + + # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h + # javah -> kaffeh + cd c + ${STAGING_BINDIR}/kaffeh -jni -classpath ../avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar de.avetana.bluetooth.stack.BlueZ + + # Native language (C) library - libavetanaBT.so + ${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath BlueZ.cpp -o ../libavetanaBT.so ${LDFLAGS} + cd .. + +} + +do_stage() { + + install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt + install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/ + +} + +do_install() { + + install -d ${D}${libdir} + install -m 0755 libavetanaBT.so ${D}${libdir}/ + + install -d ${D}${datadir}/avetanabt + install avetanaBT.jar ${D}${datadir}/avetanabt/ + +} diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb index b079160e1b..c11a00bcfa 100644 --- a/packages/bl/bl_cvs.bb +++ b/packages/bl/bl_cvs.bb @@ -23,5 +23,5 @@ do_compile (){ do_install () { install -d ${D}${bindir} - install -m4755 ${S}/bl ${D}${bindir}/bl + install -m 4755 ${S}/bl ${D}${bindir}/bl } diff --git a/packages/bt950-cs/bt950-cs_0.1.bb b/packages/bt950-cs/bt950-cs_0.1.bb index e32db47b6d..dfd288e50a 100644 --- a/packages/bt950-cs/bt950-cs_0.1.bb +++ b/packages/bt950-cs/bt950-cs_0.1.bb @@ -4,6 +4,7 @@ LICENSE = "GPLv2" HOMEPAGE = "http://www.holtmann.org/linux/bluetooth/bt950.html" DEPENDS = "pcmcia-cs" RDEPENDS = "pcmcia-cs" +PR = "r1" SRC_URI = "http://www.holtmann.org/linux/bluetooth/bt950-${PV}.tar.gz \ file://makefile.patch;patch=1" @@ -22,16 +23,3 @@ do_install() { install -m 0644 bt950.conf ${D}${sysconfdir}/pcmcia/ } -pkg_postinst() { -#!/bin/sh -if [ "x$D" != "x" ]; then - exit 1 -fi -update-modules || true -} - -pkg_postrm() { -#!/bin/sh -update-modules || true -} - diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb index ec29ad9cb8..c1c266c994 100644 --- a/packages/classpath/classpath_0.14.bb +++ b/packages/classpath/classpath_0.14.bb @@ -4,7 +4,7 @@ LICENSE = "Classpath" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" @@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}" FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" FILES_${PN}-examples = "${datadir}/${PN}/examples" +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ +} + do_install() { autotools_do_install mv ${D}${libdir}/security ${D}${libdir}/${PN} diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb index ec29ad9cb8..c1c266c994 100644 --- a/packages/classpath/classpath_0.15.bb +++ b/packages/classpath/classpath_0.15.bb @@ -4,7 +4,7 @@ LICENSE = "Classpath" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" @@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}" FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" FILES_${PN}-examples = "${datadir}/${PN}/examples" +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ +} + do_install() { autotools_do_install mv ${D}${libdir}/security ${D}${libdir}/${PN} diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb index ec29ad9cb8..fb41d7e9d8 100644 --- a/packages/classpath/classpath_0.17.bb +++ b/packages/classpath/classpath_0.17.bb @@ -4,7 +4,7 @@ LICENSE = "Classpath" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" @@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}" FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" FILES_${PN}-examples = "${datadir}/${PN}/examples" +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ +} + do_install() { autotools_do_install mv ${D}${libdir}/security ${D}${libdir}/${PN} diff --git a/packages/zgscore/zgscore-1.0.1/.mtn2git_empty b/packages/e17/e-wm/Xsession.d/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zgscore/zgscore-1.0.1/.mtn2git_empty +++ b/packages/e17/e-wm/Xsession.d/.mtn2git_empty diff --git a/packages/e17/e-wm/Xsession.d/98enlightenment b/packages/e17/e-wm/Xsession.d/98enlightenment new file mode 100644 index 0000000000..65f46284a9 --- /dev/null +++ b/packages/e17/e-wm/Xsession.d/98enlightenment @@ -0,0 +1,3 @@ +#!/bin/sh + +exec enlightenment
\ No newline at end of file diff --git a/packages/e17/e-wm/add-menu-autoscroll-options.patch b/packages/e17/e-wm/add-menu-autoscroll-options.patch new file mode 100644 index 0000000000..79bcad8e44 --- /dev/null +++ b/packages/e17/e-wm/add-menu-autoscroll-options.patch @@ -0,0 +1,207 @@ +diff -Nur e~/src/bin/e_config.c e/src/bin/e_config.c +--- e~/src/bin/e_config.c 2005-08-05 21:12:17.000000000 -0700 ++++ e/src/bin/e_config.c 2005-08-16 13:55:06.000000000 -0700 +@@ -298,6 +298,8 @@ + E_CONFIG_VAL(D, T, resize_info_follows, INT); /**/ + E_CONFIG_VAL(D, T, focus_last_focused_per_desktop, INT); /**/ + E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/ ++ E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/ ++ E_CONFIG_VAL(D, T, menu_autoscroll_cursor_margin, INT); /**/ + + e_config = e_config_domain_load("e", _e_config_edd); + if (e_config) +@@ -403,6 +405,8 @@ + e_config->resize_info_follows = 1; + e_config->focus_last_focused_per_desktop = 1; + e_config->focus_revert_on_hide_or_close = 1; ++ e_config->menu_autoscroll_margin = 10; ++ e_config->menu_autoscroll_cursor_margin = 15; + + { + E_Config_Module *em; +@@ -959,6 +963,8 @@ + E_CONFIG_LIMIT(e_config->resize_info_follows, 0, 1); + E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1); + E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1); ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50); ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50); + + /* apply lang config - exception because config is loaded after intl setup */ + +diff -Nur e~/src/bin/e_config.h e/src/bin/e_config.h +--- e~/src/bin/e_config.h 2005-08-05 21:12:18.000000000 -0700 ++++ e/src/bin/e_config.h 2005-08-16 13:55:06.000000000 -0700 +@@ -142,6 +142,8 @@ + int resize_info_follows; + int focus_last_focused_per_desktop; + int focus_revert_on_hide_or_close; ++ int menu_autoscroll_margin; ++ int menu_autoscroll_cursor_margin; + }; + + struct _E_Config_Module +diff -Nur e~/src/bin/e_ipc_handlers.h e/src/bin/e_ipc_handlers.h +--- e~/src/bin/e_ipc_handlers.h 2005-08-09 21:52:07.000000000 -0700 ++++ e/src/bin/e_ipc_handlers.h 2005-08-16 14:01:38.000000000 -0700 +@@ -4592,3 +4592,84 @@ + #if 0 + } + #endif ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-margin-set", 1, "Set the distance from the edge of the screen the menu will autoscroll to", 0, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_INT(atoi(params[0]), HDL); ++#elif (TYPE == E_WM_IN) ++ START_INT(value, HDL); ++ e_config->menu_autoscroll_margin = value; ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50); ++ SAVE; ++ END_INT; ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-margin-get", 0, "Get the distance from the edge of the screen the menu will autoscroll to", 1, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_NULL(HDL) ++#elif (TYPE == E_WM_IN) ++ SEND_INT(e_config->menu_autoscroll_margin, E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY, HDL); ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY ++#if (TYPE == E_REMOTE_OPTIONS) ++#elif (TYPE == E_REMOTE_OUT) ++#elif (TYPE == E_WM_IN) ++#elif (TYPE == E_REMOTE_IN) ++ START_INT(val, HDL) ++ printf("REPLY: %i\n", val); ++ END_INT; ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-cursor-margin-set", 1, "Set the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 0, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_INT(atoi(params[0]), HDL); ++#elif (TYPE == E_WM_IN) ++ START_INT(value, HDL); ++ e_config->menu_autoscroll_cursor_margin = value; ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50); ++ // e_zone_update_flip_all(); ++ SAVE; ++ END_INT; ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-cursor-margin-get", 0, "Get the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 1, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_NULL(HDL) ++#elif (TYPE == E_WM_IN) ++ SEND_INT(e_config->menu_autoscroll_cursor_margin, E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY, HDL); ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY ++#if (TYPE == E_REMOTE_OPTIONS) ++#elif (TYPE == E_REMOTE_OUT) ++#elif (TYPE == E_WM_IN) ++#elif (TYPE == E_REMOTE_IN) ++ START_INT(val, HDL) ++ printf("REPLY: %i\n", val); ++ END_INT; ++#endif ++#undef HDL +diff -Nur e~/src/bin/e_ipc_handlers_list.h e/src/bin/e_ipc_handlers_list.h +--- e~/src/bin/e_ipc_handlers_list.h 2005-08-05 21:00:03.000000000 -0700 ++++ e/src/bin/e_ipc_handlers_list.h 2005-08-16 13:55:06.000000000 -0700 +@@ -222,3 +222,9 @@ + #define E_IPC_OP_DESKTOP_NAME_DEL 222 + #define E_IPC_OP_DESKTOP_NAME_LIST 223 + #define E_IPC_OP_DESKTOP_NAME_LIST_REPLY 224 ++#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET 225 ++#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET 226 ++#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY 227 ++#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET 228 ++#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET 229 ++#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY 230 +diff -Nur e~/src/bin/e_menu.c e/src/bin/e_menu.c +--- e~/src/bin/e_menu.c 2005-07-25 02:55:44.000000000 -0700 ++++ e/src/bin/e_menu.c 2005-08-16 13:55:06.000000000 -0700 +@@ -1968,24 +1968,24 @@ + E_Menu *m; + + m = l->data; +- if (m->cur.x < m->zone->x) ++ if (m->cur.x < m->zone->x + e_config->menu_autoscroll_margin) + { +- i = m->zone->x - m->cur.x; ++ i = m->zone->x - m->cur.x + e_config->menu_autoscroll_margin; + if (i > outl) outl = i; + } +- if (m->cur.y < m->zone->y) ++ if (m->cur.y < m->zone->y + e_config->menu_autoscroll_margin) + { +- i = m->zone->y - m->cur.y; ++ i = m->zone->y - m->cur.y + e_config->menu_autoscroll_margin; + if (i > outt) outt = i; + } +- if ((m->cur.x + m->cur.w) > (m->zone->w)) ++ if ((m->cur.x + m->cur.w) > (m->zone->w - e_config->menu_autoscroll_margin)) + { +- i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w); ++ i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w - e_config->menu_autoscroll_margin); + if (i > outr) outr = i; + } +- if ((m->cur.y + m->cur.h) > (m->zone->h)) ++ if ((m->cur.y + m->cur.h) > (m->zone->h - e_config->menu_autoscroll_margin)) + { +- i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h); ++ i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h - e_config->menu_autoscroll_margin); + if (i > outb) outb = i; + } + } +@@ -2029,11 +2029,11 @@ + int autoscroll_x = 0; + int autoscroll_y = 0; + +- if (_e_menu_x == 0) ++ if (_e_menu_x - e_config->menu_autoscroll_cursor_margin <= 0) + { + if (_e_menu_outside_bounds_get(-1, 0)) autoscroll_x = -1; + } +- if (_e_menu_y == 0) ++ if (_e_menu_y - e_config->menu_autoscroll_cursor_margin <= 0) + { + if (_e_menu_outside_bounds_get(0, -1)) autoscroll_y = -1; + } +@@ -2044,11 +2044,11 @@ + E_Menu *m; + + m = _e_active_menus->data; +- if (_e_menu_x == (m->zone->w - 1)) ++ if (_e_menu_x + e_config->menu_autoscroll_cursor_margin >= (m->zone->w - 1)) + { + if (_e_menu_outside_bounds_get(1, 0)) autoscroll_x = 1; + } +- if (_e_menu_y == (m->zone->h - 1)) ++ if (_e_menu_y + e_config->menu_autoscroll_cursor_margin >= (m->zone->h - 1)) + { + if (_e_menu_outside_bounds_get(0, 1)) autoscroll_y = 1; + } diff --git a/packages/e17/e-wm/fudge-menu-autoscroll.patch b/packages/e17/e-wm/fudge-menu-autoscroll.patch deleted file mode 100644 index e2216986e2..0000000000 --- a/packages/e17/e-wm/fudge-menu-autoscroll.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- e/src/bin/e_menu.c~ 2005-08-15 23:09:53.000000000 -0700 -+++ e/src/bin/e_menu.c 2005-08-15 23:10:07.000000000 -0700 -@@ -1968,24 +1968,24 @@ - E_Menu *m; - - m = l->data; -- if (m->cur.x < m->zone->x) -+ if (m->cur.x < m->zone->x + 10) - { -- i = m->zone->x - m->cur.x; -+ i = m->zone->x - m->cur.x + 10; - if (i > outl) outl = i; - } -- if (m->cur.y < m->zone->y) -+ if (m->cur.y < m->zone->y + 10) - { -- i = m->zone->y - m->cur.y; -+ i = m->zone->y - m->cur.y + 10; - if (i > outt) outt = i; - } -- if ((m->cur.x + m->cur.w) > (m->zone->w)) -+ if ((m->cur.x + m->cur.w) > (m->zone->w - 10)) - { -- i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w); -+ i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w - 10); - if (i > outr) outr = i; - } -- if ((m->cur.y + m->cur.h) > (m->zone->h)) -+ if ((m->cur.y + m->cur.h) > (m->zone->h - 10)) - { -- i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h); -+ i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h - 10); - if (i > outb) outb = i; - } - } -@@ -2029,11 +2029,11 @@ - int autoscroll_x = 0; - int autoscroll_y = 0; - -- if (_e_menu_x == 0) -+ if (_e_menu_x - 10 <= 0) - { - if (_e_menu_outside_bounds_get(-1, 0)) autoscroll_x = -1; - } -- if (_e_menu_y == 0) -+ if (_e_menu_y - 10 <= 0) - { - if (_e_menu_outside_bounds_get(0, -1)) autoscroll_y = -1; - } -@@ -2044,11 +2044,11 @@ - E_Menu *m; - - m = _e_active_menus->data; -- if (_e_menu_x == (m->zone->w - 1)) -+ if (_e_menu_x + 10 >= (m->zone->w - 1)) - { - if (_e_menu_outside_bounds_get(1, 0)) autoscroll_x = 1; - } -- if (_e_menu_y == (m->zone->h - 1)) -+ if (_e_menu_y + 10 >= (m->zone->h - 1)) - { - if (_e_menu_outside_bounds_get(0, 1)) autoscroll_y = 1; - } diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index b931751ec4..e0fa41311c 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -4,11 +4,12 @@ LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r0" +PR = "r2" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ + file://Xsession.d/98enlightenment \ file://fix-configure.patch;patch=1 \ - file://fudge-menu-autoscroll.patch;patch=1" + file://add-menu-autoscroll-options.patch;patch=1" S = "${WORKDIR}/e" inherit autotools @@ -24,4 +25,9 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR}" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} diff --git a/packages/e17/e17genmenu_2.0.2.bb b/packages/e17/e17genmenu_2.0.2.bb new file mode 100644 index 0000000000..8b43e5995a --- /dev/null +++ b/packages/e17/e17genmenu_2.0.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Convert Gnome or KDE menus to e17 menus" +SECTION = "e/utils" +DEPENDS = "e virtual/ecore virtual/evas eet engrave" +LICENSE = "GPL" +HOMEPAGE = "http://sourceforge.net/projects/e17genmenu" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +PR = "r0" + +export EET_CONFIG = "${STAGING_BINDIR}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" +export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config" +export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config" + +SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-2.0.2.tar.gz" + +do_configure_prepend() { + find -type f | xargs sed -i 's:share/icons/%s/48x48/apps:share/pixmaps:' + find -type f | xargs sed -i 's:share/icons/hicolor/48x48/apps:share/pixmaps:' + find -type f | xargs sed -i 's:%s/share/pixmaps", GNOME_PREFIX, theme:%s/share/pixmaps", GNOME_PREFIX:' +} + +inherit autotools diff --git a/packages/e17/entrance/Xinit.d/50-calibrate b/packages/e17/entrance/Xinit.d/50-calibrate deleted file mode 100644 index 922b335c85..0000000000 --- a/packages/e17/entrance/Xinit.d/50-calibrate +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if ! test -e /etc/pointercal -then - xtscal -fi - diff --git a/packages/e17/entrance/Xinit.d/99-Entrance b/packages/e17/entrance/Xinit.d/99entrance index 297cc909fe..297cc909fe 100644 --- a/packages/e17/entrance/Xinit.d/99-Entrance +++ b/packages/e17/entrance/Xinit.d/99entrance diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index af11e07fd5..e43fe9aff8 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Entrace is the Enlightenment login manager" SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt -DEPENDS = "edb evas-x11 ecore-x11 edje esmart gpe-dm" -RDEPENDS += "bash gpe-dm" +DEPENDS = "edb evas-x11 ecore-x11 edje esmart bash keylaunch detect-stylus x11-common" +RDEPENDS += "bash keylaunch detect-stylus x11-common" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r2" +PR = "r3" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ file://Xserver.patch;patch=1 \ @@ -20,7 +20,10 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/ S = "${WORKDIR}/entrance" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "entrance" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ --with-xsession=/etc/X11/Xsession" diff --git a/packages/e17/evidence_20050810.bb b/packages/e17/evidence_20050810.bb new file mode 100644 index 0000000000..0950b590c6 --- /dev/null +++ b/packages/e17/evidence_20050810.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "evidence, an enlightenemt file manager" +LICENSE = "GPL" +SECTION = "e" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +# can support dbus, avifile, libmpeg3 +DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" +RDEPENDS += "examine" +PR = "r0" +CVSDATE = "${PV}" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence" +S = "${WORKDIR}/evidence" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --enable-ecore \ + --enable-ecore-ipc \ + --enable-canvas-evas2 \ + --enable-edje \ + --enable-x \ + --enable-tree-view \ + --enable-icon-view \ + --enable-browser-view \ + --with-libxine=${STAGING_LIBDIR}" + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +do_compile_prepend() { + sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile +} + +export EET_CONFIG = "${STAGING_BINDIR}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config" +export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" + +inherit autotools pkgconfig binconfig diff --git a/packages/efl++/.mtn2git_empty b/packages/efl++/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl++/.mtn2git_empty diff --git a/packages/efl++/efl++-fb_0.0.2.bb b/packages/efl++/efl++-fb_0.0.2.bb new file mode 100644 index 0000000000..b6a23d832d --- /dev/null +++ b/packages/efl++/efl++-fb_0.0.2.bb @@ -0,0 +1,3 @@ +include efl++.inc + +EFL_CONFIGURATION = "DEFINES-=EFL_HAVE_X11" diff --git a/packages/efl++/efl++-x11_0.0.2.bb b/packages/efl++/efl++-x11_0.0.2.bb new file mode 100644 index 0000000000..d3f37911ee --- /dev/null +++ b/packages/efl++/efl++-x11_0.0.2.bb @@ -0,0 +1,3 @@ +include efl++.inc + +EFL_CONFIGURATION = "DEFINES+=EFL_HAVE_X11" diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc new file mode 100644 index 0000000000..d575bfa9ee --- /dev/null +++ b/packages/efl++/efl++.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries" +SECTION = "e/libs" +LICENSE = "LGPL" +AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +MAINTAINER = "${AUTHOR}" +HOMEPAGE = "http://www.Vanille.de/projects/efl++.html" +DEPENDS = "virtual/evas virtual/ecore edje" +PROVIDES = "virtual/efl++" + +SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2" +S = "${WORKDIR}/efl++-${PV}" + +inherit qmake + +PARALLEL_MAKE = "" +QMAKE_PROFILES = "efl++.pro" +EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/misc INCLUDEPATH+=${S}/src/common \ + INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \ + LIBS+=-L${S} DESTDIR=${S} ${EFL_CONFIGURATION}" +export OE_QMAKE_LINK="${CXX}" +export EDIR="${S}" + +do_configure_prepend() { + rm include.pro + cat <<EOF >include.pro +include ( common.pro ) +DEFINES += DATADIR=\"${datadir}/efl++/\" +EOF +} + +do_stage() { + for i in src/common/*.h src/evas/*.h src/ecore/*.h src/edje/*.h + do + install -m 0644 $i ${STAGING_INCDIR} + done + oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR} +} + +do_install() { + oe_libinstall -so -C ${S} libefl++ ${D}${libdir} + install -d ${D}${bindir} + install *-* ${D}${bindir} + install -d ${D}${datadir}/efl++ + cp -a data/* ${D}${datadir}/efl++ +} + +PACKAGES =+ "efl++-examples" +FILES_${PN} = "${libdir}" +FILES_efl++-examples = "${bindir} ${datadir}" diff --git a/packages/efl++/efl++_0.0.2.bb b/packages/efl++/efl++_0.0.2.bb new file mode 100644 index 0000000000..5803f5db7a --- /dev/null +++ b/packages/efl++/efl++_0.0.2.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries" +SECTION = "e/libs" +LICENSE = "LGPL" +AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +MAINTAINER = "${AUTHOR}" +HOMEPAGE = "http://www.Vanille.de/projects/efl++.html" +DEPENDS = "virtual/evas virtual/ecore edje" + +SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2" +S = "${WORKDIR}/efl++-${PV}" + +inherit qmake + +PARALLEL_MAKE = "" +QMAKE_PROFILES = "efl++.pro" +EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \ + LIBS+=-L${S} DESTDIR=${S}" +export OE_QMAKE_LINK="${CXX}" +export EDIR="${S}" + +do_configure_prepend() { + rm include.pro + cat <<EOF >include.pro +include ( common.pro ) +DEFINES += DATADIR=\"${datadir}/efl++/\" +DEFINES += EFL_HAVE_X11 +EOF +} + +do_stage() { + for i in src/evas/*.h src/ecore/*.h src/edje/*.h + do + install -m 0644 $i ${STAGING_INCDIR} + done + oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR} +} + +do_install() { + oe_libinstall -so -C ${S} libefl++ ${D}${libdir} + install -d ${D}${bindir} + install edje-simple ${D}${bindir} + install -d ${D}${datadir}/efl++ + cp -a data/* ${D}${datadir}/efl++ +} + +PACKAGES =+ "efl++-examples" +FILES_${PN} = "${libdir}" +FILES_efl++-examples = "${bindir} ${datadir}" diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb index b017a56b69..8f4eacfc83 100644 --- a/packages/efl/e_20050810.bb +++ b/packages/efl/e_20050810.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Enlightenment Window Mananger Library" DEPENDS = "virtual/evas virtual/ecore edje eet embryo" LICENSE = "MIT" CVSDATE = "${PV}" -PR = "r0" +PR = "r1" inherit efl diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb index f0f74734a9..87fea43d20 100644 --- a/packages/efl/ecore-fb_0.9.9.013.bb +++ b/packages/efl/ecore-fb_0.9.9.013.bb @@ -1,6 +1,6 @@ include ecore.inc PROVIDES += "virtual/ecore" -PR = "r0" +PR = "r1" EXTRA_OECONF = "--enable-ecore-fb \ --enable-ecore-job \ diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb index 8a86aa0138..36a9c06413 100644 --- a/packages/efl/ecore-x11_0.9.9.013.bb +++ b/packages/efl/ecore-x11_0.9.9.013.bb @@ -1,7 +1,7 @@ include ecore.inc PROVIDES += "virtual/ecore" DEPENDS += "evas-x11" -PR = "r1" +PR = "r2" EXTRA_OECONF = "--enable-ecore-fb \ --enable-ecore-job \ diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.004.bb index a783a4d807..30c14d3d58 100644 --- a/packages/efl/edb_1.0.5.004.bb +++ b/packages/efl/edb_1.0.5.004.bb @@ -2,7 +2,7 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \ Berkeley DB 2.7.7 by Sleepycat Software." DEPENDS = "zlib ncurses" LICENSE = "BSD" -PR = "r0" +PR = "r1" inherit efl diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb index 5cab345943..e08e4407d1 100644 --- a/packages/efl/edje_0.5.0.013.bb +++ b/packages/efl/edje_0.5.0.013.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." # can also install vim data files DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" LICENSE = "MIT" -PR = "r0" +PR = "r1" inherit efl diff --git a/packages/efl/eet_0.9.10.013.bb b/packages/efl/eet_0.9.10.013.bb index 5820b910d9..c0f89b1064 100644 --- a/packages/efl/eet_0.9.10.013.bb +++ b/packages/efl/eet_0.9.10.013.bb @@ -4,6 +4,6 @@ each chunk (very much like a zip file) and allow fast \ random-access reading of the file later on." DEPENDS = "zlib jpeg" LICENSE = "BSD" -PR = "r0" +PR = "r1" inherit efl diff --git a/packages/efl/embryo_0.9.1.013.bb b/packages/efl/embryo_0.9.1.013.bb index 54f3ddabad..1802da1bca 100644 --- a/packages/efl/embryo_0.9.1.013.bb +++ b/packages/efl/embryo_0.9.1.013.bb @@ -4,6 +4,6 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ Embryo allows scripting capabilities in places that otherwise wouldn't support \ basic programming structures such as in Edje EDCs." LICENSE = "MIT" -PR = "r0" +PR = "r1" inherit efl diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb index 0d87e6b394..6ca8e3789e 100644 --- a/packages/efl/emotion_0.0.1.004.bb +++ b/packages/efl/emotion_0.0.1.004.bb @@ -1,5 +1,7 @@ DESCRIPTION = "Emotion is a multimedia library based on libxine" LICENSE = "MIT" DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine" +RDEPENDS += "libemotion-themes" +PR = "r1" inherit efl diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb index beae7a7bc1..c68b78aeb9 100644 --- a/packages/efl/esmart_0.9.0.004.bb +++ b/packages/efl/esmart_0.9.0.004.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT" DEPENDS = "evas-x11 ecore-x11 virtual/imlib2 epsilon edje libtool" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl/etox_0.9.0.004.bb b/packages/efl/etox_0.9.0.004.bb index 26edf1c0a4..e61759a22e 100644 --- a/packages/efl/etox_0.9.0.004.bb +++ b/packages/efl/etox_0.9.0.004.bb @@ -3,7 +3,7 @@ Etox helps you when it comes to displaying, moving, resizing, layering, \ clipping, aligning and coloring fonts in different styles, and more." DEPENDS = "edb virtual/evas virtual/ecore" LICENSE = "MIT" -PR = "r0" +PR = "r1" inherit efl diff --git a/packages/efl/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb index 8086d0e95a..9286853d5e 100644 --- a/packages/efl/evas-fb_0.9.9.013.bb +++ b/packages/efl/evas-fb_0.9.9.013.bb @@ -1,6 +1,6 @@ include evas.inc PROVIDES += "virtual/evas" -PR = "r0" +PR = "r1" EXTRA_OECONF = "--enable-fb \ --disable-directfb \ diff --git a/packages/efl/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb index 3d37d23cde..901a23d2a8 100644 --- a/packages/efl/evas-x11_0.9.9.013.bb +++ b/packages/efl/evas-x11_0.9.9.013.bb @@ -1,7 +1,7 @@ include evas.inc PROVIDES += "virtual/evas" DEPENDS += "x11 xext" -PR = "r2" +PR = "r3" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb index 92db160a25..0ea977fbe0 100644 --- a/packages/efl/ewl_0.0.4.004.bb +++ b/packages/efl/ewl_0.0.4.004.bb @@ -1,8 +1,9 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library based on the enlightenment foundation libraries." DEPENDS = "edb virtual/evas virtual/ecore edje emotion" +RDEPENDS += "libewl-themes" LICENSE = "MIT" -PR = "r0" +PR = "r1" inherit efl diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb index 86ca664655..18ad005092 100644 --- a/packages/evince/evince_0.3.2.bb +++ b/packages/evince/evince_0.3.2.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Evince is simply a document viewer" LICENSE = "GPL" DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" -RDEPENDS = "espgs" +RDEPENDS = "espgs gconf" RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.3/${PN}-${PV}.tar.bz2 \ file://no-doc.patch;patch=1" diff --git a/packages/fbvncserver/files/ipaq.patch b/packages/fbvncserver/files/ipaq.patch new file mode 100644 index 0000000000..e8070c0f25 --- /dev/null +++ b/packages/fbvncserver/files/ipaq.patch @@ -0,0 +1,35 @@ +diff -Nurd fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c +--- fbvncserver-0.9.4.old/fbvncserver.c 2005-07-27 22:25:25.069921936 +0200 ++++ fbvncserver-0.9.4/fbvncserver.c 2005-07-27 22:27:21.087284616 +0200 +@@ -28,7 +28,7 @@ + + + #ifdef IPAQ +-#define FANCY_PANEL_JPG "/usr/local/vnc/ipaq_panel.jpg" ++#define FANCY_PANEL_JPG "/usr/share/fbvncserver/ipaq_panel.jpg" + #define DESKTOP_NAME "iPAQ" + #else /* #ifdef ZAURUS */ + #define FANCY_PANEL_JPG "/usr/share/fbvncserver/zaurus_panel.jpg" +diff -Nurd fbvncserver-0.9.4.old/Makefile fbvncserver-0.9.4/Makefile +--- fbvncserver-0.9.4.old/Makefile 2005-07-27 22:25:25.068922088 +0200 ++++ fbvncserver-0.9.4/Makefile 2005-07-27 22:26:49.983013184 +0200 +@@ -89,7 +89,7 @@ + ${CC} ${KERNEL_INCLUDES} -Wall -D__KERNEL__ -c -o $@ $< + + ipaq_kbdsim.o: kbdsim.c +- ${CC} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $< ++ ${CC} ${KERNEL_INCLUDES} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $< + + loadjpeg.o: loadjpeg.c \ + loadjpeg.h +diff -Nurd fbvncserver-0.9.4.old/tssimd.c fbvncserver-0.9.4/tssimd.c +--- fbvncserver-0.9.4.old/tssimd.c 2005-07-27 22:25:25.070921784 +0200 ++++ fbvncserver-0.9.4/tssimd.c 2005-07-27 22:25:53.595585376 +0200 +@@ -26,6 +26,7 @@ + #include <unistd.h> + #include <errno.h> + #include <signal.h> ++#include <string.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/time.h> diff --git a/packages/findutils/findutils-native_4.1.20.bb b/packages/findutils/findutils-native_4.1.20.bb new file mode 100644 index 0000000000..47fcfdcaa9 --- /dev/null +++ b/packages/findutils/findutils-native_4.1.20.bb @@ -0,0 +1,4 @@ +inherit native +include findutils_${PV}.bb +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" +S = "${WORKDIR}/findutils-${PV}" diff --git a/packages/freetype/freetype-native_2.1.10.bb b/packages/freetype/freetype-native_2.1.10.bb new file mode 100644 index 0000000000..64fac71cbe --- /dev/null +++ b/packages/freetype/freetype-native_2.1.10.bb @@ -0,0 +1,21 @@ +include freetype_${PV}.bb +inherit native +DEPENDS = "" +FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" + +EXTRA_OEMAKE= + +do_configure() { + (cd builds/unix && gnu-configize) || die "failure running gnu-configize" + oe_runconf +} + +do_stage() { + autotools_stage_includes + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +do_install() { + : +} + diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb new file mode 100644 index 0000000000..772b316cc8 --- /dev/null +++ b/packages/freetype/freetype_2.1.10.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Freetype font rendering library" +HOMEPAGE = "http://www.freetype.org" +SECTION = "libs" +LICENSE = "freetype" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://configure.patch;patch=1" +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" + +do_configure() { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_stage() { + autotools_stage_includes + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" diff --git a/packages/gpe-dm/files/remove-X-scripts.patch b/packages/gpe-dm/files/remove-X-scripts.patch new file mode 100644 index 0000000000..b3c85be788 --- /dev/null +++ b/packages/gpe-dm/files/remove-X-scripts.patch @@ -0,0 +1,14 @@ +diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile +--- gpe-dm-0.47~/Makefile 2005-08-19 18:27:54.000000000 -0700 ++++ gpe-dm-0.47/Makefile 2005-08-19 18:28:37.000000000 -0700 +@@ -31,10 +31,6 @@ + install -d $(DESTDIR)/etc/init.d + install -d $(DESTDIR)/etc/rc2.d + install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm +- install -d $(DESTDIR)/etc/X11 +- install Xsession $(DESTDIR)/etc/X11/Xsession +- install Xinit $(DESTDIR)/etc/X11/Xinit +- install Xserver $(DESTDIR)/etc/X11/Xserver + + clean: clean-po + rm -f gpe-dm gpe-dm.o diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb index b98a235ac5..bc290ebf89 100644 --- a/packages/gpe-dm/gpe-dm_0.47.bb +++ b/packages/gpe-dm/gpe-dm_0.47.bb @@ -5,11 +5,11 @@ DESCRIPTION = "GPE Desktop Manager" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "glib-2.0" -PR = "r4" +DEPENDS = "glib-2.0 x11-common" +RDEPENDS_${PN} += "x11-common" +PR = "r5" INITSCRIPT_NAME = "gpe-dm" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." -SRC_URI += "file://collie-suspend-hack.patch;patch=1 \ - file://Xserver-cxk.patch;patch=1" +SRC_URI += "file://remove-X-scripts.patch;patch=1" diff --git a/packages/gpe-session-scripts/files/remove-x11-common-files.patch b/packages/gpe-session-scripts/files/remove-x11-common-files.patch new file mode 100644 index 0000000000..1bf896923d --- /dev/null +++ b/packages/gpe-session-scripts/files/remove-x11-common-files.patch @@ -0,0 +1,14 @@ +diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile +--- gpe-session-scripts-0.63~/Makefile 2005-08-19 18:32:17.000000000 -0700 ++++ gpe-session-scripts-0.63/Makefile 2005-08-19 18:35:46.000000000 -0700 +@@ -23,7 +23,9 @@ + all: + + install-program: gpe-logout.desktop +- for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done ++ install -d $(DESTDIR)/etc/X11/Xsession.d ++ install -m 755 X11/Xsession.d/99xWindowManager $(DESTDIR)/etc/X11/Xsession.d ++ install -m 755 X11/Xsession.d/98standard-apps $(DESTDIR)/etc/X11/Xsession.d + install -d $(DESTDIR)$(PREFIX)/bin + install -m 755 gpe-xcalibrate.sh $(DESTDIR)$(PREFIX)/bin/gpe-xcalibrate.sh + install -d $(DESTDIR)/etc/gpe diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb index 454325d2a2..19b6608e2f 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r14" +PR = "r15" inherit gpe @@ -7,23 +7,15 @@ DESCRIPTION = "GPE session startup scripts" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo" +RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common" # more rdepends: keylaunch ipaq-sleep apmd blueprobe -DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo" +DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common" -SRC_URI += "file://zaurus.sh \ - file://keymap.sh \ - file://matchbox-session \ - file://shepherd.xmodmap file://simpad.xmodmap \ - file://collie.xmodmap \ - file://disable-composite.xsettings" +SRC_URI += "file://matchbox-session \ + file://disable-composite.xsettings \ + file://remove-x11-common-files.patch;patch=1" do_install_append() { - install ${WORKDIR}/zaurus.sh ${D}${sysconfdir}/X11/Xinit.d/11zaurus - install ${WORKDIR}/keymap.sh ${D}${sysconfdir}/X11/Xinit.d/12keymap - for m in simpad shepherd collie; do - install -m 0644 ${WORKDIR}/$m.xmodmap ${D}${sysconfdir}/X11/ - done install -d ${D}${sysconfdir}/gpe/xsettings-default.d if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar diff --git a/packages/gqview/gqview_2.1.1.bb b/packages/gqview/gqview_2.1.1.bb index 83f9de44e2..eb51955cb7 100644 --- a/packages/gqview/gqview_2.1.1.bb +++ b/packages/gqview/gqview_2.1.1.bb @@ -4,6 +4,8 @@ DEPENDS = "gtk+" LICENSE = "GPL" HOMEPAGE = "http://gqview.sourceforge.net/" MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" +RRECOMMENDS = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png gdk-pixbuf-loader-gif" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.1.tar.gz \ file://include-path-fix.patch;patch=1" diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb index 6b28922f27..3d94980c59 100644 --- a/packages/gstreamer/gst-plugins_0.8.8.bb +++ b/packages/gstreamer/gst-plugins_0.8.8.bb @@ -5,6 +5,8 @@ PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" PR = "r0" +DEFAULT_PREFERENCE = "-1" + DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf" SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \ diff --git a/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch b/packages/gstreamer/gstreamer/filesrc-uri.patch index 0bde73d970..0bde73d970 100644 --- a/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch +++ b/packages/gstreamer/gstreamer/filesrc-uri.patch diff --git a/packages/gstreamer/gstreamer_0.8.10.bb b/packages/gstreamer/gstreamer_0.8.10.bb index 7247bd831a..9369258018 100644 --- a/packages/gstreamer/gstreamer_0.8.10.bb +++ b/packages/gstreamer/gstreamer_0.8.10.bb @@ -1,5 +1,6 @@ LICENSE = "LGPL" PR = "r0" +DEFAULT_PREFERENCE = "-1" DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." diff --git a/packages/gstreamer/gstreamer_0.8.9.bb b/packages/gstreamer/gstreamer_0.8.9.bb index ec5049e38f..02e93b78ec 100644 --- a/packages/gstreamer/gstreamer_0.8.9.bb +++ b/packages/gstreamer/gstreamer_0.8.9.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -PR = "r3" +PR = "r4" DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." @@ -13,6 +13,7 @@ FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a" SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ file://libm.patch;patch=1 \ file://no-libxml2.patch;patch=1 \ + file://filesrc-uri.patch;patch=1 \ file://gstreamer.xsession" EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loadsave" diff --git a/packages/initscripts/initscripts-1.0/banner b/packages/initscripts/initscripts-1.0/banner index 21a01d2846..21a01d2846 100755..100644 --- a/packages/initscripts/initscripts-1.0/banner +++ b/packages/initscripts/initscripts-1.0/banner diff --git a/packages/irssi/irssi_cvs.bb b/packages/irssi/irssi_cvs.bb index f1a2bc6f7c..818988d01e 100644 --- a/packages/irssi/irssi_cvs.bb +++ b/packages/irssi/irssi_cvs.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://irssi.org/" SECTION = "console/network" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -DEPENDS += "ncurses glib-2.0" +DEPENDS += "ncurses glib-1.2" PV = "0.8.9+cvs${CVSDATE}" PR = "r2" diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc index 0cede21082..ea308f1043 100644 --- a/packages/kaffe/kaffe.inc +++ b/packages/kaffe/kaffe.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Kaffe is a clean room implementation of the Java Virtual Machine" HOMEPAGE = "http://www.kaffe.org/" LICENSE = "GPL LGPL W3C Classpath BSD" -DEPENDS = "jikes-native fastjar-native libffi" +DEPENDS = "jikes-native fastjar-native libffi zip-native" SRC_URI += "file://disable-automake-checks.patch;patch=1" diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb index dccc7559f4..569301f3f7 100644 --- a/packages/kaffe/kaffeh-native_1.1.5.bb +++ b/packages/kaffe/kaffeh-native_1.1.5.bb @@ -1,6 +1,6 @@ SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz" S = "${WORKDIR}/kaffe-${PV}" -PR = "r2" +PR = "r3" include kaffe.inc @@ -22,4 +22,7 @@ EXTRA_OECONF = "--disable-alsatest \ do_stage() { install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/ + + install -d ${STAGING_DATADIR}/kaffeh + install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/ } diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb index 3a67db2759..2b10385e82 100644 --- a/packages/kaffe/kaffeh-native_cvs.bb +++ b/packages/kaffe/kaffeh-native_cvs.bb @@ -1,6 +1,6 @@ PV = "1.1.5+cvs${CVSDATE}" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe" S = "${WORKDIR}/kaffe" @@ -25,4 +25,8 @@ EXTRA_OECONF = "--disable-alsatest \ do_stage() { install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/ + + install -d ${STAGING_DATADIR}/kaffeh + install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/ } + diff --git a/packages/libol/.mtn2git_empty b/packages/libol/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libol/.mtn2git_empty diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb new file mode 100644 index 0000000000..be308f1153 --- /dev/null +++ b/packages/libol/libol_0.3.16.bb @@ -0,0 +1,16 @@ +PR = "r5" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" + +SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${PN}-${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" +inherit autotools + +do_stage() { + install -d ${STAGING_INCDIR}/libol + install -m 0755 ${S}/libol-config ${STAGING_BINDIR} + install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR} + ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0 + install ${S}/src/*.h ${STAGING_INCDIR}/libol/ +} + diff --git a/packages/libvncserver/libvncserver_0.6.bb b/packages/libvncserver/libvncserver_0.6.bb index 2e0a7f81c5..386f266d2d 100644 --- a/packages/libvncserver/libvncserver_0.6.bb +++ b/packages/libvncserver/libvncserver_0.6.bb @@ -5,8 +5,10 @@ DEPENDS = "zlib jpeg" LICENSE = "GPL" PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet" FILES_libvncserver-storepasswd = "${bindir}/storepasswd" -FILES_libvncserver-javaapplet = "/${datadir}fbvncserver/classes/index.vnc \ - /${datadir}fbvncserver/classes/VncViewer.jar" +FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ + ${datadir}/fbvncserver/classes/VncViewer.jar" + +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" @@ -28,7 +30,7 @@ do_stage () { do_install () { install -d ${D}${bindir} install -m 0755 examples/storepasswd ${D}${bindir} - install -d ${D}${datadir}fbvncserver/classes - install -m 0644 classes/index.vnc ${D}${datadir}fbvncserver/classes/ - install -m 0644 classes/VncViewer.jar ${D}${datadir}fbvncserver/classes/ + install -d ${D}${datadir}/fbvncserver/classes + install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ + install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ } diff --git a/packages/libvncserver/libvncserver_0.7.1.bb b/packages/libvncserver/libvncserver_0.7.1.bb index 1ae86ea69b..80a70e5f57 100644 --- a/packages/libvncserver/libvncserver_0.7.1.bb +++ b/packages/libvncserver/libvncserver_0.7.1.bb @@ -5,8 +5,10 @@ DEPENDS = "zlib jpeg" LICENSE = "GPL" PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet" FILES_libvncserver-storepasswd = "${bindir}/storepasswd" -FILES_libvncserver-javaapplet = "/${datadir}fbvncserver/classes/index.vnc \ - /${datadir}fbvncserver/classes/VncViewer.jar" +FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \ + ${datadir}/fbvncserver/classes/VncViewer.jar" + +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz" @@ -29,7 +31,7 @@ do_stage () { do_install () { install -d ${D}${bindir} install -m 0755 examples/storepasswd ${D}${bindir} - install -d ${D}${datadir}fbvncserver/classes - install -m 0644 classes/index.vnc ${D}${datadir}fbvncserver/classes/ - install -m 0644 classes/VncViewer.jar ${D}${datadir}fbvncserver/classes/ + install -d ${D}${datadir}/fbvncserver/classes + install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/ + install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/ } diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index fe8280a784..cc9f4dc6d8 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r7" +PR = "r9" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -79,13 +79,19 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/pxa27x_extraregs-r1.patch;patch=1 \ - ${RPSRC}/spitzbase-r3.patch;patch=1 \ - ${RPSRC}/spitzkbd-r0.patch;patch=1 \ + ${RPSRC}/pxa27x_extraregs-r2.patch;patch=1 \ + ${RPSRC}/spitzbase-r4.patch;patch=1 \ + ${RPSRC}/spitzkbd-r1.patch;patch=1 \ ${RPSRC}/spitzssp-r4.patch;patch=1 \ ${RPSRC}/spitzbl-r1.patch;patch=1 \ ${RPSRC}/spitzts-r1.patch;patch=1 \ ${RPSRC}/spitzcf-r1.patch;patch=1 \ + ${RPSRC}/spitz_power-r1.patch;patch=1 \ + ${RPSRC}/scoop_susres-r0.patch;patch=1 \ + ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ + ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ + ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ + ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ diff --git a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c index 47be53bf81..cc3b987575 100644 --- a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c +++ b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c @@ -76,14 +76,10 @@ static struct resource nslu2_uart_resources[] = { .flags = IORESOURCE_MEM }, { - }, -#if 0 - , { .start = IXP4XX_UART2_BASE_PHYS, .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, .flags = IORESOURCE_MEM } -#endif }; static struct plat_serial8250_port nslu2_uart_data[] = { @@ -97,19 +93,14 @@ static struct plat_serial8250_port nslu2_uart_data[] = { .uartclk = IXP4XX_UART_XTAL, }, { - }, - -#if 0 - , { .mapbase = IXP4XX_UART2_BASE_PHYS, .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, - .irq = IRQ_IXP4XX_UART1, + .irq = IRQ_IXP4XX_UART2, .flags = UPF_BOOT_AUTOCONF, .iotype = UPIO_MEM, .regshift = 2, .uartclk = IXP4XX_UART_XTAL, } -#endif }; static struct platform_device nslu2_uart = { diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index f15fc998a3..cd597fadfe 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r11" +PR = "r13" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 15f2fecdb1..f9c4865c47 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -941,7 +941,9 @@ CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -# CONFIG_SND is not set +CONFIG_SND=m +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_OSSEMUL=y # # Open Sound System diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index aaae08a77a..178c747950 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -4,7 +4,7 @@ SECTION = "kernel" PV = "2.4.20-rmk2-embedix" LICENSE = "GPL" KV = "2.4.20" -PR = "r12" +PR = "r13" SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-20050228-rom1_01.tar.bz2 \ file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \ @@ -59,7 +59,7 @@ CMDLINE_INIT = "" CMDLINE_SHARP_spitz = "RTC_RESET=1 EQUIPMENT=4 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q" CMDLINE_SHARP_akita = "EQUIPMENT=0 LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q" CMDLINE_ROOT = "root=/dev/mtdblock2" -CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_SHARP} ${CMDLINE_INIT}" +CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_MTDPARTS} ${CMDLINE_SHARP} ${CMDLINE_INIT}" # # Compensate for sucky bootloader on all Sharp Zaurus models diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 01d6ab7e4e..208041c6d6 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -389,7 +389,7 @@ CONFIG_IP_PNP_BOOTP=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_FTP is not set +CONFIG_IP_NF_FTP=m # CONFIG_IP_NF_H323 is not set # CONFIG_IP_NF_AMANDA is not set # CONFIG_IP_NF_TFTP is not set @@ -398,8 +398,8 @@ CONFIG_IP_NF_CONNTRACK=m # CONFIG_IP_NF_PPTP is not set # CONFIG_IP_NF_MATCH_HELPER is not set # CONFIG_IP_NF_MATCH_STATE is not set -# CONFIG_IP_NF_MATCH_CONNTRACK is not set -# CONFIG_IP_NF_NAT is not set +CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_NAT=m CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_LIMIT=m diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb index c02b45505e..cda40e1c0b 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r4" +PR = "r5" KERNEL_SUFFIX = "unslung" diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index bf4fae08bc..eb461a860c 100644 --- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -1,7 +1,7 @@ +DESCRIPTION = "The Gnome Virtual File System - OSSO Version" LICENSE = "GPL" SECTION = "x11/gnome" -PR = "r1" -PROVIDES = "gnome-vfs" +PR = "r2" RPROVIDES = "gnome-vfs" inherit gnome pkgconfig diff --git a/packages/make/make-native_3.80.bb b/packages/make/make-native_3.80.bb new file mode 100644 index 0000000000..848bb03539 --- /dev/null +++ b/packages/make/make-native_3.80.bb @@ -0,0 +1,9 @@ +inherit native +include make_${PV}.bb +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/make-${PV}" +S = "${WORKDIR}/make-${PV}" + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 755 make ${STAGING_BINDIR} +} diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png Binary files differindex e1f529022d..08cd476e8a 100644 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb index 31d8241aef..f51d96dd5f 100644 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb @@ -5,7 +5,7 @@ SRC_URI = "file://xrandr-panelapp.sh \ file://xrandr.png" SECTION = "x11/wm" PRIORITY = "optional" -PR = "r1" +PR = "r2" LICENSE = "MIT" do_install() { diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index b4f3558e93..45e3d67384 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" LICENSE = "MIT" PACKAGES = "task-enlightenment-x11" -PR = "r2" +PR = "r4" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" @@ -12,13 +12,13 @@ ALLOW_EMPTY = 1 # X # DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ - ttf-bitstream-vera bash" + ttf-bitstream-vera bash chkhinge" RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera" + ttf-bitstream-vera chkhinge" # # E # -DEPENDS += "entrance e-wm entice eclair examine " -RDEPENDS += "entrance e-wm entice eclair examine " +DEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils" +RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils" diff --git a/packages/meta/meta-opie-dynamic.bb b/packages/meta/meta-opie-dynamic.bb deleted file mode 100644 index a1a2bb262d..0000000000 --- a/packages/meta/meta-opie-dynamic.bb +++ /dev/null @@ -1,19 +0,0 @@ -BROKEN = 1 -# -# FIXME: -# we need to get the necessary support from the OE infrastructure -# to allow the dynamic package to work -# -DESCRIPTION = "Meta-package for Opie" - -def opie_packages(d): - import bb, os - files = os.listdir( bb.data.getVar( "TOPDIR", d, True ) ) - pkgs = [ f for f in files if f.startswith( "opie-" ) and f != "opie-3rdparty" ] - return " ".join( pkgs ) - -OPIE_PACKAGES := "${@opie_packages(d)}" - -DEPENDS = "qte libqpe-opie libopie2 manufacturers ${OPIE_PACKAGES}" - -LICENSE = MIT diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 6672dd7a18..065a109251 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Opie and QPE" SECTION = "opie/base" ALLOW_EMPTY = 1 -PR = "r24" +PR = "r25" PACKAGE_ARCH = "all" LICENSE = "MIT" @@ -273,7 +273,6 @@ opie-mediaplayer2-skin-default \ opie-mediaplayer2-skin-default-landscape \ opie-mediaplayer2-skin-pod \ opie-mediaplayer2-skin-techno \ -opie-mediaplayer2-divx \ opie-powerchord \ opie-recorder \ opie-tonleiter \ diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb index 8a32b9cb70..262db42a9f 100644 --- a/packages/meta/openslug-native-packages.bb +++ b/packages/meta/openslug-native-packages.bb @@ -1,15 +1,13 @@ DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware" LICENSE = MIT -PR = "r2" +PR = "r3" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" -# Just something the test with OPENSLUG_NATIVE_PACKAGES = "\ - gzip \ - vlan \ + apache \ " BROKEN_PACKAGES = "\ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index d8526fb64b..15de0f1fcb 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -7,9 +7,12 @@ ALLOW_EMPTY = 1 PACKAGES = "${PN}" OPENSLUG_PACKAGES = "\ + alsa-lib \ + alsa-utils \ atftp \ autoconf \ automake \ + aumix \ bash \ bind \ binutils \ @@ -45,8 +48,10 @@ OPENSLUG_PACKAGES = "\ iperf \ ipkg-utils \ iptables \ + irssi \ joe \ jpeg \ + lcdproc \ less \ libpam \ libpng \ @@ -92,6 +97,7 @@ OPENSLUG_PACKAGES = "\ pwc \ python \ quilt \ + qc-usb-messenger \ reiserfsprogs reiser4progs \ rsync \ samba \ @@ -104,6 +110,7 @@ OPENSLUG_PACKAGES = "\ streamripper \ sudo \ sysfsutils \ + syslog-ng \ tar \ thttpd \ tiff \ diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index 44eb82cf58..733063a1fc 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -44,7 +44,6 @@ UCSLUGC_PACKAGES = "\ gcc \ gdb \ gdbm \ - glib-2.0 \ gnu-config \ gphoto2 \ grep \ @@ -123,6 +122,7 @@ UCSLUGC_PACKAGES = "\ # These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. # KEEP IN ALPHABETICAL ORDER UCSLUGC_BROKEN_PACKAGES = "\ + glib-2.0 \ iperf \ man man-pages \ php \ diff --git a/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty b/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty diff --git a/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch b/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch new file mode 100644 index 0000000000..b3906b2be6 --- /dev/null +++ b/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch @@ -0,0 +1,10 @@ +--- mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in.old 2004-08-03 11:45:51.000000000 +0100 ++++ mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in 2004-08-03 11:46:04.000000000 +0100 +@@ -1429,6 +1429,7 @@ + win.close(); + + } ++ needsRestart = false; + return needsRestart; + }, + diff --git a/packages/mozilla/thunderbird-1.0.6/mozconfig b/packages/mozilla/thunderbird-1.0.6/mozconfig new file mode 100644 index 0000000000..b48cb7398d --- /dev/null +++ b/packages/mozilla/thunderbird-1.0.6/mozconfig @@ -0,0 +1,49 @@ +ac_add_options --with-pthreads +ac_add_options --disable-freetype2 +ac_add_options --disable-xprint +ac_add_options --enable-crypto +ac_add_options --disable-jsd +ac_add_options --disable-oji +ac_add_options --disable-accessibility +ac_add_options --enable-single-profile +ac_add_options --disable-composer +ac_add_options --enable-extensions=pref,spellcheck,universalchardet,wallet +ac_add_options --disable-ldap +ac_add_options --disable-mathml +ac_add_options --disable-installer +ac_add_options --disable-activex +ac_add_options --disable-activex-scripting +ac_add_options --disable-tests +ac_add_options --disable-logging +ac_add_options --enable-reorder +ac_add_options --enable-strip +ac_add_options --enable-elf-dynstr-gc +ac_add_options --enable-xterm-updates +ac_add_options --with-default-mozilla-five-home=/usr/lib/thunderbird-0.7.3 +ac_add_options --disable-pedantic +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --disable-necko-disk-cache +ac_add_options --enable-necko-small-buffers + +# use GTK+-2 widget set with XFT font rendering +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-png + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,jar,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +export MOZ_THUNDERBIRD=1 +mk_add_options MOZ_THUNDERBIRD=1 +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/packages/mozilla/thunderbird_1.0.6.bb b/packages/mozilla/thunderbird_1.0.6.bb new file mode 100644 index 0000000000..52d68ef481 --- /dev/null +++ b/packages/mozilla/thunderbird_1.0.6.bb @@ -0,0 +1,63 @@ +SECTION = "x11/utils" +DEPENDS += "gnupg" +RRECOMMENDS += "gnupg" +PR = "r0" + +EMVER="0.92.0" +IPCVER="1.1.3" +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2 \ + http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz \ +http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \ + file://xptcstubs.patch;patch=1 \ + file://no-xmb.patch;patch=1 \ + file://extensions-hack.patch;patch=1 \ + file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop" +S = "${WORKDIR}/mozilla" + +FILES_${PN} += "${libdir}/thunderbird-${PV} ${datadir}/idl" + +inherit mozilla + +export MOZ_THUNDERBIRD=1 + +do_configure() { + for x in ipc enigmail; do + if [ ! -e ${WORKDIR}/mozilla/extensions/$x ]; then + mv ${WORKDIR}/$x ${WORKDIR}/mozilla/extensions/ + cd ${WORKDIR}/mozilla/extensions/$x + makemake + fi + done + cd ${S} + mozilla_do_configure +} + +do_compile() { + mozilla_do_compile + oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc + oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail +} + +do_install() { + mozilla_do_install + oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc DESTDIR="${D}" install + oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail DESTDIR="${D}" install + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/mozilla-thunderbird.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/mozilla-thunderbird.png ${D}${datadir}/pixmaps/ +} + +pkg_postinst_thunderbird() { + chmod -R a+w ${libdir}/thunderbird* +} + +# Simulate the silly csh makemake script +makemake() { + typeset m topdir + for m in $(find . -name Makefile.in); do + topdir=$(echo "$m" | sed -r 's:[^/]+:..:g') + sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \ + < ${m} > ${m%.in} || die "sed ${m} failed" + done +} diff --git a/packages/mtd/mtd-utils-native_20050715.bb b/packages/mtd/mtd-utils-native_20050801.bb index cd1fb7d11b..cd1fb7d11b 100644 --- a/packages/mtd/mtd-utils-native_20050715.bb +++ b/packages/mtd/mtd-utils-native_20050801.bb diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch index b63868cbb2..3ac41280bb 100644 --- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch +++ b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch @@ -1,10 +1,10 @@ # -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# Patch managed by http://www.holgerschurig.de/patcher.html # ---- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2 2004-11-27 00:00:13.000000000 +0100 -+++ mtd/util/mkfs.jffs2.c 2005-01-31 22:52:33.830141174 +0100 +--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch ++++ mtd/util/mkfs.jffs2.c @@ -92,7 +92,12 @@ struct filesystem_entry *files; /* Only relevant to directories */ }; diff --git a/packages/mtd/mtd-utils/more-verbosity.patch b/packages/mtd/mtd-utils/more-verbosity.patch index 25b98d35bb..cdc842a8f9 100644 --- a/packages/mtd/mtd-utils/more-verbosity.patch +++ b/packages/mtd/mtd-utils/more-verbosity.patch @@ -1,10 +1,10 @@ # -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# Patch managed by http://www.holgerschurig.de/patcher.html # ---- mtd/util/mkfs.jffs2.c~add-progress 2005-01-31 22:55:34.662944000 +0100 -+++ mtd/util/mkfs.jffs2.c 2005-01-31 23:45:50.604511261 +0100 +--- mtd/util/mkfs.jffs2.c~more-verbosity.patch ++++ mtd/util/mkfs.jffs2.c @@ -374,6 +374,9 @@ struct filesystem_entry *entry; struct ignorepath_entry* element = ignorepath; diff --git a/packages/mtd/mtd-utils/removelinuxinc.patch b/packages/mtd/mtd-utils/removelinuxinc.patch deleted file mode 100644 index 984d1af514..0000000000 --- a/packages/mtd/mtd-utils/removelinuxinc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urN mtd.orig/fs/jffs2/compr_rtime.c mtd/fs/jffs2/compr_rtime.c ---- mtd.orig/fs/jffs2/compr_rtime.c 2004-04-02 20:36:01.000000000 -0500 -+++ mtd/fs/jffs2/compr_rtime.c 2004-04-02 20:35:37.000000000 -0500 -@@ -21,11 +21,7 @@ - * - */ - --#include <linux/kernel.h> --#include <linux/types.h> --#include <linux/errno.h> --#include <linux/string.h> -- -+#include <string.h> - #include <stdint.h> - - /* _compress returns the compressed size, -1 if bigger */ diff --git a/packages/mtd/mtd-utils/stdint.patch b/packages/mtd/mtd-utils/stdint.patch deleted file mode 100644 index ba171fcfde..0000000000 --- a/packages/mtd/mtd-utils/stdint.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fs/jffs2/compr_rtime.c 2004-04-01 00:07:53.000000000 +0100 -+++ fs/jffs2/compr_rtime.c 2004-04-01 00:07:53.000000000 +0100 -@@ -26,6 +26,8 @@ - #include <linux/errno.h> - #include <linux/string.h> - -+#include <stdint.h> -+ - /* _compress returns the compressed size, -1 if bigger */ - int jffs2_rtime_compress(unsigned char *data_in, unsigned char *cpage_out, - uint32_t *sourcelen, uint32_t *dstlen) diff --git a/packages/mtd/mtd-utils_20050715.bb b/packages/mtd/mtd-utils_20050801.bb index 6b457d52d7..bfc78c19ea 100644 --- a/packages/mtd/mtd-utils_20050715.bb +++ b/packages/mtd/mtd-utils_20050801.bb @@ -3,10 +3,7 @@ SECTION = "base" DEPENDS = "zlib" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ - flashcp nandwrite jffs2dump" -PR = "r2" +PR = "r0" SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \ file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \ @@ -26,6 +23,10 @@ do_stage () { done } +mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ + mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ + flashcp nandwrite jffs2dump" + do_install () { install -d ${D}${bindir} for binary in ${mtd_utils}; do diff --git a/packages/nonworking/alsa-driver/alsadriver_0.9.8.bb b/packages/nonworking/alsa-driver/alsadriver_0.9.8.bb deleted file mode 100644 index 3962dc6035..0000000000 --- a/packages/nonworking/alsa-driver/alsadriver_0.9.8.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION="Alsa Drivers" -MAINTAINER="Lorn Potter <lpotter@trolltech.com>" -LICENSE="GPL" -DEPENDS="" - -SCR_URI="ftp://ftp.alsa-project.org/pub/lib/alsa-driver-${PV}.tar.bz2" - -S="${WORKDIR}/${P}" - -inherit autotools -# libtool - diff --git a/packages/nonworking/emotion/emotion_cvs.bb b/packages/nonworking/emotion/emotion_cvs.bb deleted file mode 100644 index 1f4143478b..0000000000 --- a/packages/nonworking/emotion/emotion_cvs.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Emotion is an Evas smart-object library providing video capabilities. \ -Emotion leverages libxine 1.0 and integrates seemlessly with the rest of the EFL. \ -Because its based on libxine, any format that it supports (Theora, DiVX, MPEG2, etc) \ -is avalible using Emotion." -SECTION = "libs" -DEPENDS = "libxine edb eet evas ecore embryo edje" -PV = "${CVSDATE}" -PR = "r0" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/emotion" -S = "${WORKDIR}/emotion" - -inherit autotools binconfig - -do_stage () { - oe_libinstall -C src libemotion ${STAGING_LIBDIR}/ - install -m 0644 ${S}/src/Emotion.h ${STAGING_INCDIR}/ -} - -PACKAGES += "emotion-examples" - -FILES_${PN} = "${libdir}/libemotion*.so*" -FILES_${PN}-dev += "${bindir}/emotion-config ${libdir}/pkgconfig" -FILES_${PN}-examples = "${bindir}/emotion* ${datadir}" - diff --git a/packages/nonworking/esmart/esmart_cvs.bb b/packages/nonworking/esmart/esmart_cvs.bb deleted file mode 100644 index d12048e82b..0000000000 --- a/packages/nonworking/esmart/esmart_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "A collection of smart Evas objects" -SECTION = "libs" -DEPENDS = "evas evas-x11 ecore imlib2 edje libtool" -PV = "${CVSDATE}" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/esmart" -S = "${WORKDIR}/esmart" - -inherit autotools pkgconfig binconfig - -do_stage () { - oe_libinstall -C src/lib libesmart ${STAGING_LIBDIR}/ - install -m 0644 ${S}/src/lib/Esmart.h ${STAGING_INCDIR}/ -} diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling index ce2e528c92..bed1789a6f 100755 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling @@ -11,9 +11,11 @@ fi if [ $# -eq 1 ] ; then if [ "$1" = "disk1" ] ; then + mtch="/dev/sdb1 /share/hdd/data ext3 rw 0 0" targ=/share/hdd/data flag=.sda1root elif [ "$1" = "disk2" ] ; then + mtch="/dev/sda1 /share/flash/data ext3 rw 0 0" targ=/share/flash/data flag=.sdb1root else @@ -27,11 +29,22 @@ fi # Check it's a real mount point -if grep $targ /proc/mounts >/dev/null 2>&1 ; then - echo "Target disk is $targ" -else - echo "Error: $targ is not a mounted disk" - exit 1 +echo "Waiting for $targ" +CNT=120 +while [ $CNT -gt 0 ] +do + if grep "$mtch" /proc/mounts >/dev/null 2>&1 ; then + echo "Target disk is $targ" + CNT=-1 + else + echo -ne "\r$CNT " + sleep 1 + CNT=`expr $CNT - 1` + fi +done +if [ $CNT -eq 0 ] ; then + echo "Error: $targ is not a mounted disk" + exit 1 fi # Start at the root directory diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index 398d934a52..2f2e5e1866 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,6 +1,6 @@ SECTION = "base" -PR = "r1" +PR = "r3" DEPENDS = "nslu2-linksys-libs" @@ -86,10 +86,10 @@ do_compile () { rm -rf ${S}/lib # Install upgrade mode files - mv ${S}/home/httpd/html/Management/upgrade.htm ${S}/home/httpd/html/Management/upgrade-old.htm - mv ${S}/home/httpd/html/Management/upgrade.cgi ${S}/home/httpd/html/Management/upgrade-old.cgi - install -m 644 ${WORKDIR}/upgrade.htm ${S}/home/httpd/html/Management - install -m 755 ${WORKDIR}/upgrade.cgi ${S}/home/httpd/html/Management +# mv ${S}/home/httpd/html/Management/upgrade.htm ${S}/home/httpd/html/Management/upgrade-old.htm +# mv ${S}/home/httpd/html/Management/upgrade.cgi ${S}/home/httpd/html/Management/upgrade-old.cgi +# install -m 644 ${WORKDIR}/upgrade.htm ${S}/home/httpd/html/Management +# install -m 755 ${WORKDIR}/upgrade.cgi ${S}/home/httpd/html/Management sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ ${S}/home/httpd/html/Management/upgrade.htm } diff --git a/packages/obexpush/.mtn2git_empty b/packages/obexpush/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/obexpush/.mtn2git_empty diff --git a/packages/obexpush/files/.mtn2git_empty b/packages/obexpush/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/obexpush/files/.mtn2git_empty diff --git a/packages/obexpush/files/init b/packages/obexpush/files/init new file mode 100644 index 0000000000..a9891ef8ad --- /dev/null +++ b/packages/obexpush/files/init @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Start or stop the OBEX Push daemon. +# +# Written by Michael Haynie <mbhaynie@zoominternet.net> +# +# It might be better to just edit the bluetooth script, +# since opd depends heavily on it. +# + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +[ -f /etc/default/rcS ] && . /etc/default/rcS +[ -f /etc/default/opd_args ] && . /etc/default/opd_args + +case "$1" in + start) + echo -n "Starting the OBEX Push daemon: " + start-stop-daemon -S -x /usr/sbin/opd -- --daemonize $OPD_ARGS + if [ $? = 0 ]; then + echo "opd." + else + echo "(failed.)" + fi + ;; + stop) + echo -n "Stopping the OBEX Push daemon: " + start-stop-daemon -K \ + -x /usr/sbin/opd + echo "opd." + ;; + restart|force-reload) + $0 stop + $0 start + exit + ;; + *) + echo "Usage: " $0 " {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/obexpush/obexpush/.mtn2git_empty b/packages/obexpush/obexpush/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/obexpush/obexpush/.mtn2git_empty diff --git a/packages/obexpush/obexpush/add-obextool.patch b/packages/obexpush/obexpush/add-obextool.patch new file mode 100644 index 0000000000..34a7625818 --- /dev/null +++ b/packages/obexpush/obexpush/add-obextool.patch @@ -0,0 +1,461 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- obexpush/client/obex_main.c~add-obextool.patch ++++ obexpush/client/obex_main.c +@@ -221,12 +221,7 @@ + return NULL; + } + +- +- #ifdef OLDLIBOBEX +- custfunc.userdata = gt->userdata; +- #else //OLDLIBOBEX + custfunc.customdata = gt->userdata; +- #endif //OLDLIBOBEX + custfunc.connect = cobex_connect; + custfunc.disconnect = cobex_disconnect; + custfunc.write = cobex_write; +--- /dev/null ++++ obexpush/client/obextool.c +@@ -0,0 +1,411 @@ ++/* ++ * ++ * Bluetooth OBEX tool ++ * ++ * Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org> ++ * ++ * ++ * 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-1307 USA ++ * ++ */ ++ ++#include <stdio.h> ++#include <errno.h> ++#include <fcntl.h> ++#include <getopt.h> ++#include <string.h> ++#include <libgen.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <sys/stat.h> ++#include <sys/time.h> ++#include <sys/param.h> ++#include <sys/socket.h> ++ ++#include <bluetooth/bluetooth.h> ++#include <bluetooth/hci.h> ++#include <bluetooth/hci_lib.h> ++#include <bluetooth/rfcomm.h> ++ ++#include <glib.h> ++#include <openobex/obex.h> ++ ++ ++ ++volatile int finished = 0; ++ ++struct btobex_context_t { ++ int fd; ++ bdaddr_t bdaddr; ++ uint8_t channel; ++} btobex_context; ++ ++ ++gint btobex_connect(obex_t *handle, gpointer userdata) ++{ ++ struct btobex_context_t *context = userdata; ++ struct sockaddr_rc laddr, raddr; ++ int s; ++ ++ if ((s = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)) < 0) { ++ printf("Can't create socket. %s (%d)\n", strerror(errno), errno); ++ return -1; ++ } ++ ++ laddr.rc_family = AF_BLUETOOTH; ++ bacpy(&laddr.rc_bdaddr, BDADDR_ANY); ++ laddr.rc_channel = 0; ++ if (bind(s, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) { ++ printf("Can't bind socket. %s (%d)\n", strerror(errno), errno); ++ close(s); ++ return -1; ++ } ++ ++ raddr.rc_family = AF_BLUETOOTH; ++ bacpy(&raddr.rc_bdaddr, &context->bdaddr); ++ raddr.rc_channel = context->channel; ++ if (connect(s, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) { ++ printf("Can't connect. %s (%d)\n", strerror(errno), errno); ++ close(s); ++ return -1; ++ } ++ ++ context->fd = s; ++ ++ return 1; ++} ++ ++ ++gint btobex_disconnect(obex_t *handle, gpointer userdata) ++{ ++ struct btobex_context_t *context = userdata; ++ ++ close(context->fd); ++ ++ return 1; ++} ++ ++ ++gint btobex_listen(obex_t *handle, gpointer userdata) ++{ ++ printf("The listen command is not implemented\n"); ++ ++ return -1; ++} ++ ++ ++gint btobex_write(obex_t *handle, gpointer userdata, guint8 *buffer, gint length) ++{ ++ struct btobex_context_t *context = userdata; ++ ++ return (write(context->fd, buffer, length)); ++} ++ ++ ++gint btobex_handleinput(obex_t *handle, gpointer userdata, gint timeout) ++{ ++ struct btobex_context_t *context = userdata; ++ struct timeval to; ++ fd_set fdset; ++ unsigned char buf[1024]; ++ int sel, len; ++ ++ to.tv_sec = timeout; ++ to.tv_usec = 0; ++ ++ FD_ZERO(&fdset); ++ FD_SET(context->fd, &fdset); ++ ++ len = 0; ++ ++ if ((sel = select(context->fd + 1, &fdset, NULL, NULL, &to)) > 0) { ++ if ((len = read(context->fd, buf, sizeof(buf))) > 0) ++ OBEX_CustomDataFeed(handle, buf, len); ++ } ++ ++ return len; ++} ++ ++ ++obex_ctrans_t btobex_ctrans = { ++ customdata: &btobex_context, ++ connect: btobex_connect, ++ disconnect: btobex_disconnect, ++ listen: btobex_listen, ++ write: btobex_write, ++ handleinput: btobex_handleinput, ++}; ++ ++ ++void btobex_event(obex_t *handle, obex_object_t *object, gint mode, gint event, gint obex_cmd, gint obex_rsp) ++{ ++ switch (event) { ++ case OBEX_EV_PROGRESS: ++ break; ++ case OBEX_EV_ABORT: ++ printf("Request aborted\n"); ++ finished = 1; ++ break; ++ case OBEX_EV_REQDONE: ++ finished = 1; ++ break; ++ case OBEX_EV_REQHINT: ++ printf("Request hint\n"); ++ break; ++ case OBEX_EV_REQ: ++ printf("Server request\n"); ++ break; ++ case OBEX_EV_LINKERR: ++ OBEX_TransportDisconnect(handle); ++ printf("Link broken\n"); ++ break; ++ case OBEX_EV_PARSEERR: ++ printf("Parse error\n"); ++ break; ++ default: ++ printf("Unknown event 0x%02x\n", event); ++ break; ++ } ++} ++ ++ ++ ++guint8 *btobex_readfile(const char *filename, int *filesize) ++{ ++ guint8 *buf; ++ struct stat stats; ++ int fd, fs; ++ ++ stat(filename, &stats); ++ fs = stats.st_size; ++ ++ if ((fd = open(filename, O_RDONLY, 0)) < 0) ++ return NULL; ++ ++ if (!(buf = g_malloc(fs))) { ++ close(fd); ++ return NULL; ++ } ++ ++ *filesize = read(fd, buf, fs); ++ ++ close(fd); ++ ++ return buf; ++} ++ ++ ++int btobex_push(bdaddr_t *bdaddr, uint8_t channel, char *filename, char *alias) ++{ ++ obex_t *handle; ++ obex_object_t *object; ++ obex_headerdata_t hd; ++ ++ guint8 namebuf[MAXPATHLEN + 1]; ++ int namelen; ++ guint8 *databuf; ++ int datalen; ++ ++ int err; ++ ++ if (!(handle = OBEX_Init(OBEX_TRANS_CUST, btobex_event, 0))) { ++ printf("Init of OBEX failed. %s (%d)", strerror(errno), errno); ++ return -1; ++ } ++ ++ bacpy(&btobex_context.bdaddr, bdaddr); ++ btobex_context.channel = channel; ++ ++ OBEX_SetUserData(handle, &btobex_context); ++ ++ if (OBEX_RegisterCTransport(handle, &btobex_ctrans) < 0) { ++ printf("Custom transport callback registration failed."); ++ return -1; ++ } ++ ++ if (OBEX_TransportConnect(handle, (void *)1, 0) != 1) ++ return -1; ++ ++ ++ object = OBEX_ObjectNew(handle, OBEX_CMD_CONNECT); ++ err = OBEX_Request(handle, object); ++ ++ finished = 0; ++ while (!finished) { ++ if ((err = OBEX_HandleInput(handle, 1)) < 0) { ++ printf("Error while handling input.\n"); ++ break; ++ } ++ } ++ ++ ++ object = OBEX_ObjectNew(handle, OBEX_CMD_PUT); ++ ++ namelen = OBEX_CharToUnicode(namebuf, alias, MAXPATHLEN); ++ hd.bs = namebuf; ++ OBEX_ObjectAddHeader(handle, object, OBEX_HDR_NAME, hd, namelen, 0); ++ ++ if (!(databuf = btobex_readfile(filename, &datalen))) { ++ OBEX_TransportDisconnect(handle); ++ return -1; ++ } ++ ++ hd.bq4 = datalen; ++ OBEX_ObjectAddHeader(handle, object, OBEX_HDR_LENGTH, hd, sizeof(guint32), 0); ++ ++ hd.bs = databuf; ++ OBEX_ObjectAddHeader(handle, object, OBEX_HDR_BODY, hd, datalen, 0); ++ ++ printf("Sending object ...\n"); ++ ++ err = OBEX_Request(handle, object); ++ ++ finished = 0; ++ while (!finished) { ++ if ((err = OBEX_HandleInput(handle, 1)) < 0) { ++ printf("Error while handling input.\n"); ++ break; ++ } ++ } ++ ++ ++ object = OBEX_ObjectNew(handle, OBEX_CMD_DISCONNECT); ++ err = OBEX_Request(handle, object); ++ ++ finished = 0; ++ while (!finished) { ++ if ((err = OBEX_HandleInput(handle, 1)) < 0) { ++ printf("Error while handling input.\n"); ++ break; ++ } ++ } ++ ++ ++ OBEX_TransportDisconnect(handle); ++ ++ return 0; ++} ++ ++ ++ ++static void usage(void); ++ ++ ++void cmd_push(bdaddr_t *local, int argc, char **argv) ++{ ++ char *filename; ++ char *alias; ++ bdaddr_t bdaddr; ++ uint8_t channel; ++ ++ if (argc < 3) { ++ usage(); ++ return; ++ } ++ ++ filename = argv[1]; ++ alias = basename(filename); ++ str2ba(argv[2], &bdaddr); ++ channel = (argc > 3) ? atoi(argv[3]) : 10; ++ ++ btobex_push(&bdaddr, channel, filename, alias); ++} ++ ++ ++struct { ++ char *cmd; ++ void (*func)(bdaddr_t *bdaddr, int argc, char **argv); ++ char *opt; ++ char *doc; ++} command[] = { ++ { "push", cmd_push, "<file> <bdaddr> [channel]", "Push a file" }, ++ { NULL, NULL, 0, 0 } ++}; ++ ++ ++static void usage(void) ++{ ++ int i; ++ ++ printf("Bluetooth OBEX tool\n\n"); ++ ++ printf("Usage:\n" ++ "\tobextool [options] <command>\n" ++ "\n"); ++ ++ printf("Options:\n" ++ "\t-i [hciX|bdaddr] Local HCI device or BD Address\n" ++ "\t-h, --help Display help\n" ++ "\n"); ++ ++ printf("Commands:\n"); ++ for (i = 0; command[i].cmd; i++) ++ printf("\t%-6s %-18s\t%s\n", command[i].cmd, ++ command[i].opt ? command[i].opt : " ", ++ command[i].doc); ++ printf("\n"); ++} ++ ++ ++static struct option main_options[] = { ++ { "help", 0, 0, 'h' }, ++ { "device", 1, 0, 'i' }, ++ { 0, 0, 0, 0 } ++}; ++ ++ ++int main(int argc, char *argv[]) ++{ ++ bdaddr_t bdaddr; ++ int i, opt; ++ ++ bacpy(&bdaddr, BDADDR_ANY); ++ ++ while ((opt = getopt_long(argc, argv, "+i:h", main_options, NULL)) != -1) { ++ switch(opt) { ++ case 'i': ++ if (strncmp(optarg, "hci", 3) == 0) ++ hci_devba(atoi(optarg + 3), &bdaddr); ++ else ++ str2ba(optarg, &bdaddr); ++ break; ++ case 'h': ++ usage(); ++ exit(0); ++ default: ++ exit(0); ++ } ++ } ++ ++ argc -= optind; ++ argv += optind; ++ optind = 0; ++ ++ if (argc < 1) { ++ usage(); ++ exit(0); ++ } ++ ++ for (i = 0; command[i].cmd; i++) { ++ if (strncmp(command[i].cmd, argv[0], 3)) ++ continue; ++ command[i].func(&bdaddr, argc, argv); ++ exit(0); ++ } ++ ++ usage(); ++ ++ return 0; ++} +--- obexpush/client/Makefile~add-obextool.patch ++++ obexpush/client/Makefile +@@ -35,11 +35,21 @@ + # + + ussp-push: obex_main.o obex_socket.o +- gcc obex_main.o obex_socket.o ${GLIBLIB} ${OBEXLIB} -o ussp-push ++ $(CC) obex_main.o obex_socket.o ${GLIBLIB} ${OBEXLIB} -o ussp-push + + obex_main.o: obex_main.c obex_socket.h +- gcc ${OBEXINC} ${GLIBINC} -c obex_main.c -o obex_main.o ++ $(CC) ${OBEXINC} ${GLIBINC} -c obex_main.c -o obex_main.o + + obex_socket.o: obex_socket.c obex_socket.h +- gcc ${OBEXINC} ${GLIBINC} -c obex_socket.c -o obex_socket.o ++ $(CC) ${OBEXINC} ${GLIBINC} -c obex_socket.c -o obex_socket.o ++ ++ ++ ++obextool: obextool.o ++ $(CC) obextool.o ${GLIBLIB} ${OBEXLIB} -lbluetooth -o obextool ++ ++obextool.o: obextool.c ++ $(CC) ${OBEXINC} ${GLIBINC} -c obextool.c -o obextool.o ++ ++all: ussp-push obextool + diff --git a/packages/obexpush/obexpush_1.0.0.bb b/packages/obexpush/obexpush_1.0.0.bb new file mode 100644 index 0000000000..b441e7c3a6 --- /dev/null +++ b/packages/obexpush/obexpush_1.0.0.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Obex Push Utilities" +HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php" +SECTION = "console/network" +LICENSE = "GPL" +DEPENDS = "glib-2.0 openobex bluez-libs" +PR = "r1" + +SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \ + file://add-obextool.patch;patch=1 \ + file://init" +S = "${WORKDIR}/obexpush" + +inherit update-rc.d + +INITSCRIPT_NAME = "opd" +INITSCRIPT_PARAMS = "defaults 33 09" + +export GLIBINC=-I${STAGING_INCDIR}/glib-2.0 +export GLIBLIB=-I${STAGING_LIBDIR} -lglib-2.0 +export OBEXINC=-I${STAGING_INCDIR} +export OBEXLIB=-L${STAGING_LIBDIR} -lopenobex + +do_configure() { + rm -f client/*.o client/ussp-push + rm -f opd/*.o opd/opd + sed -i 's:gcc:${CC}:' */Makefile + sed -i 's:__FUNCTION__::' opd/*.c +} + +do_compile() { + oe_runmake -C client ussp-push + oe_runmake -C client obextool + oe_runmake -C opd +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${sbindir} + install -m 0755 client/ussp-push ${D}${bindir} + install -m 0755 client/obextool ${D}${bindir} + install -m 0755 opd/opd ${D}${sbindir} + + install -d ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd +} + diff --git a/packages/qc-usb-messenger/.mtn2git_empty b/packages/qc-usb-messenger/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qc-usb-messenger/.mtn2git_empty diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix new file mode 100644 index 0000000000..ff3572db8d --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix @@ -0,0 +1,25 @@ +diff -Naur qc-usb-messenger-0.8/qc-memory.c qc-usb-messenger-0.8-fixed/qc-memory.c +--- qc-usb-messenger-0.8/qc-memory.c 2003-12-15 10:31:46.000000000 +0100 ++++ qc-usb-messenger-0.8-fixed/qc-memory.c 2005-02-22 17:53:50.000000000 +0100 +@@ -63,9 +63,9 @@ + #endif + + #if !HAVE_VMA +-static inline int qc_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return remap_page_range(from, addr, size, prot); } +-#undef remap_page_range +-#define remap_page_range(vma, start, addr, size, prot) qc_remap_page_range((start),(addr),(size),(prot)) ++static inline int qc_io_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return io_remap_page_range(from, addr, size, prot); } ++#undef io_remap_page_range ++#define io_remap_page_range(vma, start, addr, size, prot) qc_io_remap_page_range((start),(addr),(size),(prot)) + #endif + + #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map) +@@ -230,7 +230,7 @@ + pos = (unsigned long)src; + while ((long)size > 0) { + physaddr = kvirt_to_pa(pos); +- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) ++ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) + return -EAGAIN; + start += PAGE_SIZE; + pos += PAGE_SIZE; diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb new file mode 100644 index 0000000000..e7041c6990 --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ + file://qc-messenger-0.8-fix;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'CC="${KERNEL_CC}"' \ + 'LD="${KERNEL_LD}"' \ + 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ + all +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc +} + diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index c48c48ae56..72cf7e63e4 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -3,7 +3,8 @@ MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "openssl" DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." LICENCE = "GPL" -PR = "r4" +LICENCE = "GPL" +PR = "r5" SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ldflags.patch;patch=1 \ @@ -12,7 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ssmtp.conf" S = "${WORKDIR}/${PN}-2.61" LICENSE = "GPL" -#CONFFILES = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases" +CONFFILES_${PN} = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases" inherit autotools EXTRA_OECONF = "--enable-ssl" diff --git a/packages/subversion/.mtn2git_empty b/packages/subversion/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/subversion/.mtn2git_empty diff --git a/packages/subversion/files/.mtn2git_empty b/packages/subversion/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/subversion/files/.mtn2git_empty diff --git a/packages/subversion/files/disable-revision-install.patch b/packages/subversion/files/disable-revision-install.patch new file mode 100644 index 0000000000..a1c60654cb --- /dev/null +++ b/packages/subversion/files/disable-revision-install.patch @@ -0,0 +1,22 @@ +--- subversion-1.2.0-r0/Makefile.in.old 2005-07-17 22:28:21.898728312 +0200 ++++ subversion-1.2.0-r0/Makefile.in 2005-07-17 22:30:05.361999504 +0200 +@@ -260,7 +260,7 @@ + clean: external-clean local-clean + distclean: external-distclean local-distclean + extraclean: external-extraclean local-extraclean +-install: external-install local-install revision-install ++install: external-install local-install #revision-install + + @INCLUDE_OUTPUTS@ + +@@ -320,8 +320,8 @@ + local-install: @INSTALL_RULES@ + + ### HACK!! Find a better way to do this +-revision-install: +- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt ++#revision-install: ++# subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt + + install-static: @INSTALL_STATIC_RULES@ + diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb new file mode 100644 index 0000000000..790a552666 --- /dev/null +++ b/packages/subversion/subversion_1.2.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util" +MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>" +LICENSE = "GPL" + +PR = "r0" + +SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ + file://disable-revision-install.patch;patch=1" + +EXTRA_OECONF = "--without-neon --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}" + +inherit autotools + +do_configure() { + oe_runconf +} diff --git a/packages/syslog-ng/.mtn2git_empty b/packages/syslog-ng/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/syslog-ng/.mtn2git_empty diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb new file mode 100644 index 0000000000..a4c2fde2d2 --- /dev/null +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -0,0 +1,17 @@ +PR = "r4" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +DEPENDS = "libol" + +SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" +inherit autotools + +EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/" +CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf" + +do_install_append() { + install -d ${D}/${sysconfdir}/${PN} + install ${S}/doc/syslog-ng.conf.sample ${D}${sysconfdir}/${PN}/syslog-ng.conf + +} diff --git a/packages/sysvinit/sysvinit/openslug/inittab b/packages/sysvinit/sysvinit/openslug/inittab index 567855b9f0..a82c1f5449 100644 --- a/packages/sysvinit/sysvinit/openslug/inittab +++ b/packages/sysvinit/sysvinit/openslug/inittab @@ -27,6 +27,6 @@ l4:4:wait:/etc/init.d/rc 4 l5:5:wait:/etc/init.d/rc 5 l6:6:wait:/etc/init.d/rc 6 # Normally not reached, but fallthrough in case of emergency. -z6:6:respawn:/sbin/sulogini +z6:6:respawn:/sbin/sulogin ca:123456:ctrlaltdel:/sbin/poweroff diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb index 3871c80c04..271dd1fcd3 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.2.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb @@ -31,8 +31,8 @@ do_stage() { install -d ${OE_QMAKE_INCDIR_QT} install -d ${OE_QMAKE_LIBDIR_QT} - install -m 0755 bin/moc ${OE_QMAKE_UIC} - install -m 0755 bin/uic ${OE_QMAKE_MOC} + install -m 0755 bin/moc ${OE_QMAKE_MOC} + install -m 0755 bin/uic ${OE_QMAKE_UIC} install -m 0655 lib/*.a ${OE_QMAKE_LIBDIR_QT} for f in include/*.h diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty diff --git a/packages/uicmoc/uicmoc4-native-4.0.0/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch index 491edde370..491edde370 100644 --- a/packages/uicmoc/uicmoc4-native-4.0.0/fix-mkspecs.patch +++ b/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch diff --git a/packages/uicmoc/uicmoc4-native_4.0.0.bb b/packages/uicmoc/uicmoc4-native_4.0.1.bb index 7d986b20dd..399215c0eb 100644 --- a/packages/uicmoc/uicmoc4-native_4.0.0.bb +++ b/packages/uicmoc/uicmoc4-native_4.0.1.bb @@ -4,9 +4,9 @@ PRIORITY = "optional" LICENSE = "GPL QPL" PR = "r1" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-${PV}.tar.bz2 \ +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://fix-mkspecs.patch;patch=1 " -S = "${WORKDIR}/qt-x11-opensource-desktop-${PV}" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" inherit native diff --git a/packages/x11/x11-common/.mtn2git_empty b/packages/x11/x11-common/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x11/x11-common/.mtn2git_empty diff --git a/packages/x11/x11-common/etc/.mtn2git_empty b/packages/x11/x11-common/etc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x11/x11-common/etc/.mtn2git_empty diff --git a/packages/x11/x11-common/etc/X11/.mtn2git_empty b/packages/x11/x11-common/etc/X11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/.mtn2git_empty diff --git a/packages/x11/x11-common/etc/X11/Xdefaults b/packages/x11/x11-common/etc/X11/Xdefaults new file mode 100644 index 0000000000..f5b69dd516 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xdefaults @@ -0,0 +1,3 @@ +Rxvt*scrollBar_right: true +Rxvt*font: xft:Mono:pixelsize=9 + diff --git a/packages/x11/x11-common/etc/X11/Xinit b/packages/x11/x11-common/etc/X11/Xinit new file mode 100644 index 0000000000..f566ffe5be --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xinit @@ -0,0 +1,16 @@ +#!/bin/sh +# + +export USER=root +export HOME=/home/root +if [ ! -d $HOME ] && [ -d /root ]; then + HOME=/root +fi +export XAPPLRESDIR=/usr/X11R6/lib/app-defaults +export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad + +export PATH=$PATH:/usr/X11R6/bin + +SYSSESSIONDIR=/etc/X11/Xinit.d + +exec run-parts $SYSSESSIONDIR diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr b/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr new file mode 100644 index 0000000000..abde87d53c --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr @@ -0,0 +1,4 @@ +#!/bin/sh + +xrandr -o normal + diff --git a/packages/gpe-session-scripts/files/zaurus.sh b/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus index 61ca84b595..61ca84b595 100644 --- a/packages/gpe-session-scripts/files/zaurus.sh +++ b/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap index 0e64aac9f4..0e64aac9f4 100644 --- a/packages/gpe-session-scripts/files/keymap.sh +++ b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate b/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate new file mode 100644 index 0000000000..de47b871a2 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ ! -f /etc/pointercal ]; then + /usr/bin/xtscal +fi + diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap b/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap new file mode 100644 index 0000000000..7ae3b58860 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ -f /proc/hal/model ]; then + xmodmap -e 'keycode 104 = Return' +fi diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver b/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver new file mode 100644 index 0000000000..5f6d0dae5d --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver @@ -0,0 +1,4 @@ +#!/bin/sh + +xset s 30 180 +xset s off diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults new file mode 100644 index 0000000000..6b35e0357c --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults @@ -0,0 +1,3 @@ +#!/bin/sh + +xrdb -load -nocpp < /etc/X11/Xdefaults diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver new file mode 100644 index 0000000000..e7e6dd1ddb --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xserver @@ -0,0 +1,73 @@ +#!/bin/sh +# + +XSERVER=Xipaq +if [ -f /usr/bin/Xfbdev ]; then + XSERVER=Xfbdev +fi +if [ -f /usr/bin/Xepson ]; then + XSERVER=Xepson +fi +if [ -f /usr/bin/Xorg ]; then + XSERVER=Xorg +fi +if [ -f /usr/bin/Xomap ]; then + XSERVER=Xomap +fi + +. /etc/profile + +module_id() { + ## used to read from assets, but sometimes assets is corrupted + # grep "Module ID" /proc/hal/assets | sed "s/.*://" + ## used to read from /proc/hal/model, but that is removed in 2.6 + # echo ' iPAQ' `cat /proc/hal/model` + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +export USER=root + +ARGS="-dpi 100 -br -pn" + +# use ucb 1x00 touchscreen if present +if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then + ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" +fi + +# use usb mouse if present +# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically +if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then + ARGS="$ARGS -mouse /dev/input/mice" +fi + +# start off server in conventional location. +case `module_id` in + "HP iPAQ H3100" | "HP iPAQ H3800") + ARGS="$ARGS -screen 320x240@90 -rgba vrgb" ;; + "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") + ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;; + "HP iPAQ H5400" | "HP iPAQ H2200") + ARGS="$ARGS -rgba rgb" ;; + "Ramses") + # What is this "vt2" in aid of? + ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;; + # both 'Sharp-Collie' and just 'Collie' have been reported + *Poodle) + ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;; + *Collie) + ARGS="$ARGS -screen 320x240@270 -rgba vrgb" + # Horrible hack required to enable resuming after suspend + rm -f /dev/apm_bios + killall -9 apmd + ;; + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + ARGS="$ARGS -rgba rgb" ;; + "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") + ARGS="$ARGS -rgba rgb -screen 640x480@270" ;; + "Simpad") + ARGS="$ARGS -rgba rgb" ;; + "Generic OMAP1510/1610/1710") + ARGS="$ARGS -mouse /dev/input/event0" ;; +esac + +exec $XSERVER $ARGS $* diff --git a/packages/x11/x11-common/etc/X11/Xsession b/packages/x11/x11-common/etc/X11/Xsession new file mode 100644 index 0000000000..cfa3a9a6e3 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xsession @@ -0,0 +1,47 @@ +#!/bin/sh + +# this location MUST be consistent with /etc/X11/gpe-login.pre-session +HOME_VOLATILE=/home/$USER/ramdisk +export HOME_VOLATILE + +if [ -f /usr/bin/dbus-launch ]; then + ## test for an existing bus daemon, just to be safe + if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then + ## if not found, launch a new one + eval `dbus-launch --auto-syntax --exit-with-session` + echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS" + fi +fi + +. /etc/profile + +if [ -f $HOME/.profile ]; then + . $HOME/.profile +fi + +SYSSESSIONDIR=/etc/X11/Xsession-gpe.d + +if [ ! -d $SYSSESSIONDIR ]; then + SYSSESSIONDIR=/etc/X11/Xsession.d +fi + +# Use run-parts to source every file in the session directory; we source +# instead of executing so that the variables and functions defined above +# are available to the scripts, and so that they can pass variables to each +# other. + +# Can't use run-parts like this, busybox doesn't support it. Use ls instead +#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR) + +SESSIONFILES=`ls -X $SYSSESSIONDIR` +if [ -n "$SESSIONFILES" ]; then + for SESSIONFILE in $SESSIONFILES; do + # Test if script is executable first before sourcing it + if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then + . $SYSSESSIONDIR/$SESSIONFILE + fi + done +fi + +exit 0 + diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults new file mode 100644 index 0000000000..d3a284d8da --- /dev/null +++ b/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults @@ -0,0 +1,4 @@ +#!/bin/sh +if [ -e $HOME/.Xdefaults ]; then + xrdb -merge -nocpp < $HOME/.Xdefaults +fi diff --git a/packages/gpe-session-scripts/files/collie.xmodmap b/packages/x11/x11-common/etc/X11/collie.xmodmap index 5c0b39dc88..5c0b39dc88 100644 --- a/packages/gpe-session-scripts/files/collie.xmodmap +++ b/packages/x11/x11-common/etc/X11/collie.xmodmap diff --git a/packages/gpe-session-scripts/files/shepherd.xmodmap b/packages/x11/x11-common/etc/X11/shepherd.xmodmap index 0a03b4f426..0a03b4f426 100644 --- a/packages/gpe-session-scripts/files/shepherd.xmodmap +++ b/packages/x11/x11-common/etc/X11/shepherd.xmodmap diff --git a/packages/gpe-session-scripts/files/simpad.xmodmap b/packages/x11/x11-common/etc/X11/simpad.xmodmap index d8b73b207f..d8b73b207f 100644 --- a/packages/gpe-session-scripts/files/simpad.xmodmap +++ b/packages/x11/x11-common/etc/X11/simpad.xmodmap diff --git a/packages/x11/x11-common_0.1.bb b/packages/x11/x11-common_0.1.bb new file mode 100644 index 0000000000..707c766555 --- /dev/null +++ b/packages/x11/x11-common_0.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Common X11 scripts" +LICENSE = "GPL" +SECTION = "x11" +DEPENDS = "xmodmap xrandr xdpyinfo xtscal" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r0" + +SRC_URI = "file://etc" +S = ${WORKDIR} + +do_install() { + cp -R ${S}/etc ${D}/etc + chmod -R 755 ${D}/etc +}
\ No newline at end of file diff --git a/packages/zgscore/files/.mtn2git_empty b/packages/zgscore/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zgscore/files/.mtn2git_empty diff --git a/packages/zgscore/zgscore-1.0.1/qtopia17.patch b/packages/zgscore/files/qtopia17.patch index 7741ca51a5..7741ca51a5 100644 --- a/packages/zgscore/zgscore-1.0.1/qtopia17.patch +++ b/packages/zgscore/files/qtopia17.patch diff --git a/packages/zgscore/zgscore_1.0.1.bb b/packages/zgscore/zgscore_1.0.2.bb index 83dacef745..e3dc83117c 100644 --- a/packages/zgscore/zgscore_1.0.1.bb +++ b/packages/zgscore/zgscore_1.0.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" HOMEPAGE = "http://nuke.cinlug.org/modules/Static_Docs/data/db/zgs/" -PR = "r1" +PR = "r0" SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zgs/zgscore_${PV}_arm.src.tar.gz \ file://qtopia17.patch;patch=1" |
