diff options
Diffstat (limited to 'packages')
60 files changed, 1248 insertions, 638 deletions
diff --git a/packages/libsdl/libsdl-x11-1.2.7/.mtn2git_empty b/packages/crimsonfields/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libsdl/libsdl-x11-1.2.7/.mtn2git_empty +++ b/packages/crimsonfields/.mtn2git_empty diff --git a/packages/crimsonfields/crimsonfields-native_0.4.8.bb b/packages/crimsonfields/crimsonfields-native_0.4.8.bb new file mode 100644 index 0000000000..212590b754 --- /dev/null +++ b/packages/crimsonfields/crimsonfields-native_0.4.8.bb @@ -0,0 +1,26 @@ +include crimsonfields_${PV}.bb +inherit native + +DEPENDS = "libsdl-native libsdl-ttf-native" +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native" + +do_configure() { + gnu-configize + oe_runconf +} + +do_compile() { + cd tools && oe_runmake +} + +do_stage() { + for binary in ${HOST_TOOLS} + do + install -m 0755 tools/$binary ${STAGING_BINDIR} + done + install -m 0644 tools/default.* ${STAGING_DATADIR} +} + +do_install() { + : +} diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb new file mode 100644 index 0000000000..1a6f52b8f4 --- /dev/null +++ b/packages/crimsonfields/crimsonfields_0.4.8.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Crimson Fields is a tactical war game in the tradition of Battle Isle." +SECTION = "games" +DEPENDS = "crimsonfields-native virtual/libsdl libsdl-mixer libsdl-ttf" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2 \ + file://native-tools.patch;patch=1" +S = "${WORKDIR}/crimson-${PV}" + +inherit autotools + +HOST_TOOLS = "cfed mkdatafile mklocale mktileset mkunitset" + +do_configure() { + gnu-configize + oe_runconf + for binary in ${HOST_TOOLS} + do + install -m 0755 ${STAGING_DIR}/${BUILD_SYS}/bin/$binary tools/ + done + install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/default.* tools/ +} + +do_install() { + autotools_do_install + install -d ${D}${palmtopdir}/apps/Games/ + install -d ${D}${palmtopdir}/pics/ + install -m 0644 ${D}${datadir}/applications/crimson.desktop ${D}${palmtopdir}/apps/Games/ + install -m 0644 ${D}${datadir}/pixmaps/*.png ${D}${palmtopdir}/pics/ +} + +FILES_${PN} = "${bindir} ${datadir} ${palmtopdir}" diff --git a/packages/nonworking/crimsonfields/.mtn2git_empty b/packages/crimsonfields/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/crimsonfields/.mtn2git_empty +++ b/packages/crimsonfields/files/.mtn2git_empty diff --git a/packages/crimsonfields/files/native-tools.patch b/packages/crimsonfields/files/native-tools.patch new file mode 100644 index 0000000000..aa5ecc4be0 --- /dev/null +++ b/packages/crimsonfields/files/native-tools.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- crimson-0.4.8/Makefile.in~native-tools ++++ crimson-0.4.8/Makefile.in +@@ -170,7 +170,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + EXTRA_DIST = crimson.desktop crimson.spec.in README.bi2cf README.CoMET +-SUBDIRS = doc src tools gfx levels locale music sfx ++SUBDIRS = doc src gfx levels locale music sfx + DISTCHECK_CONFIGURE_FLAGS = --enable-bi2cf --enable-cf2bmp --enable-cfed --enable-comet + desktopdir = $(datadir)/applications + desktop_DATA = crimson.desktop diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb index cb4d4f18f2..36bfe5d89d 100644 --- a/packages/cron/cron_3.0pl1.bb +++ b/packages/cron/cron_3.0pl1.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "Vixie cron." LICENSE = "cron" -PR="r6" +PR="r7" DEPENDS += "install-native" SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \ @@ -12,7 +12,7 @@ S = "${WORKDIR}/cron${PV}" INITSCRIPT_NAME = "cron" INITSCRIPT_PARAMS = "defaults" - +inherit update-rc.d CFLAGS_append = " -I${S} -DSYS_TIME_H=0" do_install () { diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index 3a2b54072f..80373e3a1b 100644 --- a/packages/dropbear/dropbear_0.46.bb +++ b/packages/dropbear/dropbear_0.46.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" SECTION = "console/network" LICENSE = "MIT" DEPENDS = "zlib" -PR = "r1" +PR = "r3" PROVIDES = "ssh sshd" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ @@ -41,10 +41,8 @@ do_install() { ${D}${localstatedir} install -m 0755 dropbearmulti ${D}${sbindir}/ - for i in ${BINCOMMANDS} - do - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i - done + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + for i in ${SBINCOMMANDS} do ln -s ./dropbearmulti ${D}${sbindir}/$i @@ -57,6 +55,11 @@ do_install() { chmod 755 ${D}${sysconfdir}/init.d/dropbear } +pkg_postinst () { + update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 + update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 +} + pkg_postrm_append () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_rsa_host_key @@ -64,4 +67,6 @@ pkg_postrm_append () { if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_dss_host_key fi + update-alternatives --remove ssh ${bindir}/dropbearmulti + update-alternatives --remove scp ${bindir}/dropbearmulti } diff --git a/packages/gpe-login/gpe-login_0.80.bb b/packages/gpe-login/gpe-login_0.80.bb new file mode 100644 index 0000000000..594bde73c3 --- /dev/null +++ b/packages/gpe-login/gpe-login_0.80.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb new file mode 100644 index 0000000000..76884bd09e --- /dev/null +++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb @@ -0,0 +1,54 @@ +PR = "r1" +PV = "0.16+cvs-${CVSDATE}" + +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser" +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" +DEPENDS = "osb-nrcit libgpewidget" +DEFAULT_PREFERENCE = "-1" + +S = "${WORKDIR}/gpe-mini-browser" + +inherit autotools + +do_install() { + # install -d ${D}${docdir}/gpe + # install -m 0644 ${S}/gpe-mini-browser.html ${D}${docdir}/gpe/ + install -d ${D}/usr/share/applications + install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop + install -d ${D}/usr/share/pixmaps + install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png + autotools_do_install +} + +pkg_postinst_${PN}-doc () { + #!/bin/sh + if [ "x$D" != "x" ]; then + if [ -e /etc/gpe/gpe-help.conf ]; then + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + else + echo [Help] >> /etc/gpe/gpe-help.conf + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi + fi +} + +pkg_postrm_${PN}-doc () { + #!/bin/sh + if [ -e /etc/gpe/gpe-help.conf ]; then + sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf + mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi +} diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index dbfde00053..dc7fa37401 100755 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -30,7 +30,7 @@ keycode 13 = keycode 14 = BackSpace altgr keycode 14 = Delete keycode 15 = Tab - altgr keycode 15 = Caps_Lock + shift keycode 65 = Caps_Lock keycode 16 = q keycode 17 = w altgr keycode 17 = asciicircum @@ -143,71 +143,71 @@ string Prior = "\033[5~" string Next = "\033[6~" string Macro = "\033[M" string Pause = "\033[P" -compose '`' 'A' to 'À' -compose '`' 'a' to 'à' -compose '\'' 'A' to 'Á' -compose '\'' 'a' to 'á' -compose '^' 'A' to 'Â' -compose '^' 'a' to 'â' -compose '~' 'A' to 'Ã' -compose '~' 'a' to 'ã' -compose '"' 'A' to 'Ä' -compose '"' 'a' to 'ä' -compose 'O' 'A' to 'Å' -compose 'o' 'a' to 'å' -compose '0' 'A' to 'Å' -compose '0' 'a' to 'å' -compose 'A' 'A' to 'Å' -compose 'a' 'a' to 'å' -compose 'A' 'E' to 'Æ' -compose 'a' 'e' to 'æ' -compose ',' 'C' to 'Ç' -compose ',' 'c' to 'ç' -compose '`' 'E' to 'È' -compose '`' 'e' to 'è' -compose '\'' 'E' to 'É' -compose '\'' 'e' to 'é' -compose '^' 'E' to 'Ê' -compose '^' 'e' to 'ê' -compose '"' 'E' to 'Ë' -compose '"' 'e' to 'ë' -compose '`' 'I' to 'Ì' -compose '`' 'i' to 'ì' -compose '\'' 'I' to 'Í' -compose '\'' 'i' to 'í' -compose '^' 'I' to 'Î' -compose '^' 'i' to 'î' -compose '"' 'I' to 'Ï' -compose '"' 'i' to 'ï' -compose '-' 'D' to 'Ð' -compose '-' 'd' to 'ð' -compose '~' 'N' to 'Ñ' -compose '~' 'n' to 'ñ' -compose '`' 'O' to 'Ò' -compose '`' 'o' to 'ò' -compose '\'' 'O' to 'Ó' -compose '\'' 'o' to 'ó' -compose '^' 'O' to 'Ô' -compose '^' 'o' to 'ô' -compose '~' 'O' to 'Õ' -compose '~' 'o' to 'õ' -compose '"' 'O' to 'Ö' -compose '"' 'o' to 'ö' -compose '/' 'O' to 'Ø' -compose '/' 'o' to 'ø' -compose '`' 'U' to 'Ù' -compose '`' 'u' to 'ù' -compose '\'' 'U' to 'Ú' -compose '\'' 'u' to 'ú' -compose '^' 'U' to 'Û' -compose '^' 'u' to 'û' -compose '"' 'U' to 'Ü' -compose '"' 'u' to 'ü' -compose '\'' 'Y' to 'Ý' -compose '\'' 'y' to 'ý' -compose 'T' 'H' to 'Þ' -compose 't' 'h' to 'þ' -compose 's' 's' to 'ß' -compose '"' 'y' to 'ÿ' -compose 's' 'z' to 'ß' -compose 'i' 'j' to 'ÿ' +compose '`' 'A' to '' +compose '`' 'a' to '' +compose '\'' 'A' to '' +compose '\'' 'a' to '' +compose '^' 'A' to '' +compose '^' 'a' to '' +compose '~' 'A' to '' +compose '~' 'a' to '' +compose '"' 'A' to '' +compose '"' 'a' to '' +compose 'O' 'A' to '' +compose 'o' 'a' to '' +compose '0' 'A' to '' +compose '0' 'a' to '' +compose 'A' 'A' to '' +compose 'a' 'a' to '' +compose 'A' 'E' to '' +compose 'a' 'e' to '' +compose ',' 'C' to '' +compose ',' 'c' to '' +compose '`' 'E' to '' +compose '`' 'e' to '' +compose '\'' 'E' to '' +compose '\'' 'e' to '' +compose '^' 'E' to '' +compose '^' 'e' to '' +compose '"' 'E' to '' +compose '"' 'e' to '' +compose '`' 'I' to '' +compose '`' 'i' to '' +compose '\'' 'I' to '' +compose '\'' 'i' to '' +compose '^' 'I' to '' +compose '^' 'i' to '' +compose '"' 'I' to '' +compose '"' 'i' to '' +compose '-' 'D' to '' +compose '-' 'd' to '' +compose '~' 'N' to '' +compose '~' 'n' to '' +compose '`' 'O' to '' +compose '`' 'o' to '' +compose '\'' 'O' to '' +compose '\'' 'o' to '' +compose '^' 'O' to '' +compose '^' 'o' to '' +compose '~' 'O' to '' +compose '~' 'o' to '' +compose '"' 'O' to '' +compose '"' 'o' to '' +compose '/' 'O' to '' +compose '/' 'o' to '' +compose '`' 'U' to '' +compose '`' 'u' to '' +compose '\'' 'U' to '' +compose '\'' 'u' to '' +compose '^' 'U' to '' +compose '^' 'u' to '' +compose '"' 'U' to '' +compose '"' 'u' to '' +compose '\'' 'Y' to '' +compose '\'' 'y' to '' +compose 'T' 'H' to '' +compose 't' 'h' to '' +compose 's' 's' to '' +compose '"' 'y' to '' +compose 's' 'z' to '' +compose 'i' 'j' to '' diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index bf60cec12f..99b2a7dfbd 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r53" +PR = "r54" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff index 15b1bc2928..4f32e7498f 100644 --- a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff +++ b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff @@ -1,5 +1,5 @@ ---- lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 -+++ lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 +--- ./../lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 ++++ ./../lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 @@ -65,7 +65,7 @@ diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb index ef075e8c8a..cca0d78fec 100644 --- a/packages/iperf/iperf_1.7.0.bb +++ b/packages/iperf/iperf_1.7.0.bb @@ -3,14 +3,14 @@ DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tu HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" +PR = "r1" SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \ - file://socketaddr-h-errno.diff;patch=1;pnum=0" + file://socketaddr-h-errno.diff;patch=1" inherit autotools S="${WORKDIR}/iperf-${PV}/cfg" -PATCHES_DIR="${WORKDIR}/iperf-${PV}" do_configure() { oe_runconf diff --git a/packages/libsdl/files/.mtn2git_empty b/packages/libsdl/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsdl/files/.mtn2git_empty diff --git a/packages/libsdl/libsdl-x11-1.2.7/acinclude.m4 b/packages/libsdl/files/acinclude.m4 index ca2df9d5e5..ca2df9d5e5 100644 --- a/packages/libsdl/libsdl-x11-1.2.7/acinclude.m4 +++ b/packages/libsdl/files/acinclude.m4 diff --git a/packages/libsdl/libsdl-x11-1.2.7/extra-keys.patch b/packages/libsdl/files/extra-keys.patch index f12f0c7efb..f12f0c7efb 100644 --- a/packages/libsdl/libsdl-x11-1.2.7/extra-keys.patch +++ b/packages/libsdl/files/extra-keys.patch diff --git a/packages/libsdl/libsdl-native_1.2.7.bb b/packages/libsdl/libsdl-native_1.2.7.bb new file mode 100644 index 0000000000..9cd0d82ffc --- /dev/null +++ b/packages/libsdl/libsdl-native_1.2.7.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "Simple DirectMedia Layer - native Edition" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ + file://extra-keys.patch;patch=1 \ + file://acinclude.m4" +S = "${WORKDIR}/SDL-${PV}" + +inherit autotools native + +EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \ + --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \ + --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ + --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \ + --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ + --disable-video-xbios --disable-video-gem --disable-video-dummy \ + --disable-video-opengl --enable-input-events --enable-pthreads \ + --disable-video-picogui --disable-video-qtopia --enable-dlopen" + +do_configure_prepend() { + rm -f ${S}/acinclude.m4 + cp ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_configure_append () { + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage() { + oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} + ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so + #oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR} + install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/SDL + for f in include/*.h + do + install -m 0644 $f ${STAGING_INCDIR}/SDL/ + done + + cat >${STAGING_BINDIR}/sdl-config-native <<EOF +#!/bin/sh + case "\$1" in + --prefix) + echo /usr + ;; + --exec-prefix) + echo /usr + ;; + --version) + echo ${PV} + ;; + --cflags) + echo -I${STAGING_INCDIR}/SDL -D_REENTRANT + ;; + --libs) + echo -lSDLmain -lSDL-1.2 -lpthread -L${STAGING_LIBDIR} + ;; + esac +EOF + chmod a+rx ${STAGING_BINDIR}/sdl-config-native +} diff --git a/packages/libsdl/libsdl-ttf-native_2.0.3.bb b/packages/libsdl/libsdl-ttf-native_2.0.3.bb new file mode 100644 index 0000000000..ced6862ad7 --- /dev/null +++ b/packages/libsdl/libsdl-ttf-native_2.0.3.bb @@ -0,0 +1,10 @@ +include libsdl-ttf_${PV}.bb +inherit native + +DEPENDS = "libsdl-native" +FILESPATH = "${FILE_DIRNAME}/libsdl-ttf-${PV}:${FILE_DIRNAME}/libsdl-ttf:${FILE_DIRNAME}/files" + +EXTRA_OECONF = "--disable-sdltest --with-sdl-prefix=${STAGING_LIBDIR}/.." + +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native" + diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb deleted file mode 100644 index ff4dae1c8e..0000000000 --- a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "x11/libs" -# libxfce4mcs OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="Settings management library used by most XFce 4 modules" -DEPENDS="libxfce4util" - -inherit xfce pkgconfig - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs - - install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} - oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4util/libxfce4util.inc b/packages/libxfce4util/libxfce4util.inc index fcd5b74ad8..dbe6501e42 100644 --- a/packages/libxfce4util/libxfce4util.inc +++ b/packages/libxfce4util/libxfce4util.inc @@ -7,16 +7,6 @@ SECTION = "x11/libs" LICENSE = "GPL" DEPENDS = "glib-2.0" -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="0" - inherit xfce pkgconfig XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ @@ -24,11 +14,18 @@ XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ xfce-fileutils.h xfce-rc.h" +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/xfce4/libxfce4util + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util + install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util done oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} + + install -d ${STAGING_DATADIR}/aclocal/ + install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/ } + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" diff --git a/packages/libxfce4util/libxfce4util_4.2.0.bb b/packages/libxfce4util/libxfce4util_4.2.0.bb deleted file mode 100644 index fcd5b74ad8..0000000000 --- a/packages/libxfce4util/libxfce4util_4.2.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -# libxfce4util OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPL" -DEPENDS = "glib-2.0" - -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="0" - -inherit xfce pkgconfig - -XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ - i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ - xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ - xfce-fileutils.h xfce-rc.h" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/xfce4/libxfce4util - for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util - done - - oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4util/libxfce4util_4.2.2.bb b/packages/libxfce4util/libxfce4util_4.2.2.bb index 0fbc5321bb..e89d2cfa97 100644 --- a/packages/libxfce4util/libxfce4util_4.2.2.bb +++ b/packages/libxfce4util/libxfce4util_4.2.2.bb @@ -3,11 +3,5 @@ # Released under the MIT license (see packages/COPYING) include ${PN}.inc +PR = "r1" -MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" -FILES_${PN}-dev += " ${datadir}/xfce4/m4" - -do_stage() { - install -d ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/libxfcegui4/libxfcegui4.inc b/packages/libxfcegui4/libxfcegui4.inc index 36a125b747..882cf3a55b 100644 --- a/packages/libxfcegui4/libxfcegui4.inc +++ b/packages/libxfcegui4/libxfcegui4.inc @@ -2,15 +2,12 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE Widget library and X Window System interaction" -DEPENDS="libxfce4util dbh libxml2 gtk+" +DESCRIPTION = "XFCE Widget library and X Window System interaction" +DEPENDS = "libxfce4util dbh libxml2 gtk+" SECTION = "x11/libs" inherit xfce pkgconfig -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ gtk_style.h netk-util.h xfce_aboutdialog.h \ gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ @@ -29,17 +26,17 @@ XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules + install -d ${STAGING_INCDIR}/libxfcegui4 + install -d ${STAGING_INCDIR}/xfce4-modules + install -d ${STAGING_LIBDIR}/modules for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 + install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/libxfcegui4 done for file in ${MODULE_HEADERS}; do install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules + ${STAGING_INCDIR}/xfce4-modules done oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} @@ -51,3 +48,5 @@ do_stage() { oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ ${STAGING_LIBDIR}/xfce4/modules } + +FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/libxfcegui4/libxfcegui4_4.2.0.bb b/packages/libxfcegui4/libxfcegui4_4.2.0.bb deleted file mode 100644 index 4eb5d8a781..0000000000 --- a/packages/libxfcegui4/libxfcegui4_4.2.0.bb +++ /dev/null @@ -1,53 +0,0 @@ -SECTION = "x11/libs" -# libxfcegui4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE Widget library and X Window System interaction" -DEPENDS="libxfce4util dbh libxml2 gtk+" - -inherit xfce pkgconfig - -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - -XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ - gtk_style.h netk-util.h xfce_aboutdialog.h \ - gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ - icons.h netk-window-menu.h xfce_decorbutton.h \ - libnetk.h netk-window.h xfce_decortoggle.h \ - libxfcegui4-config.h netk-workspace.h xfce_framebox.h \ - libxfcegui4.h preview_filesel.h xfce_iconbutton.h \ - netk-application.h session-client.h xfce_marshal.h \ - netk-class-group.h xfce-appmenuitem.h xfce_menubutton.h \ - netk-enum-types.h xfce-colorbutton.h xfce_movehandler.h \ - netk-marshal.h xfce-exec.h xfce_scaled_image.h \ - netk-pager.h xfce-filechooser.h xfce_systemtray.h \ - netk-screen.h xfce-gdk-extensions.h xfce_togglebutton.h \ - netk-tasklist.h xfce-gtk-extensions.h xinerama.h" - -MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules - - for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 - done - - for file in ${MODULE_HEADERS}; do - install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules - done - - oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} - - oe_libinstall -C xfce4-modules/mime-icons -so libxfce4_mime_icons \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/combo -so libxfce4_combo \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ - ${STAGING_LIBDIR}/xfce4/modules -} diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb index 2c7042c7ca..7e7df86702 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r0" +PR = "r1" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -25,6 +25,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \ ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \ + ${RPSRC}/reverse_pagefault-r0.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \ @@ -40,14 +41,14 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ - ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ + ${RPSRC}/corgi_base_extras1-r3.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/corgi_power-r24.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${RPSRC}/mmc_sd-r5.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ - ${RPSRC}/corgi_snd-r6.patch;patch=1 \ + ${RPSRC}/corgi_snd-r8.patch;patch=1 \ ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \ diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle index 6102a630c0..e318a9f427 100644 --- a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle +++ b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle @@ -123,6 +123,8 @@ CONFIG_ARCH_PXA_POODLE=y # CONFIG_ARCH_PXA_SHEPHERD is not set # CONFIG_ARCH_PXA_HUSKY is not set # CONFIG_ARCH_PXA_BOXER is not set +# CONFIG_ARCH_PXA_TOSA is not set +# CONFIG_ARCH_PXA_TOSA_SKIP is not set CONFIG_ARCH_SHARP_SL=y CONFIG_SL_CCCR_CHANGE=y CONFIG_SL_CCCR242=y @@ -389,6 +391,7 @@ CONFIG_NET_IPGRE=m # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set +# CONFIG_IPSEC is not set # # Network device support @@ -581,12 +584,12 @@ CONFIG_BLK_DEV_IDECS=y # # Input core support # -# CONFIG_INPUT is not set -# CONFIG_INPUT_KEYBDEV is not set +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_UINPUT=m # # Character devices @@ -597,8 +600,14 @@ CONFIG_SERIAL=y # CONFIG_SERIAL_CONSOLE is not set CONFIG_SERIAL_SL_SERIES=y # CONFIG_SL_TS_PRESSURE is not set +# CONFIG_BOOT_PRESSURE_ON is not set # CONFIG_SL7X0_POWER_KEY_OFF is not set +# CONFIG_BOOT_POWER_KEY_OFF is not set # CONFIG_SL_3BUTTON_PATCH is not set +# CONFIG_BOOT_3BUTTON_PATCH_ON is not set +# CONFIG_SL_WRITE_TS is not set +# CONFIG_BLUETOOTH_SL is not set +# CONFIG_KBD_DEV_FILE is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -653,6 +662,32 @@ CONFIG_UNIX98_PTY_COUNT=256 # Joysticks # # CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +# CONFIG_INPUT_SERIO is not set +# CONFIG_INPUT_SERPORT is not set +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set # CONFIG_QIC02_TAPE is not set # @@ -664,6 +699,7 @@ CONFIG_UNIX98_PTY_COUNT=256 # CONFIG_RTC is not set CONFIG_COTULLA_RTC=y CONFIG_ADS7846_TS=y +# CONFIG_TOSA_TS is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -857,6 +893,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_FB_POODLE=y CONFIG_POODLE_CONSISTENT_ALLOC=y # CONFIG_FB_CORGI is not set +# CONFIG_FB_TOSA is not set # CONFIG_SHARP_LOGO_SCREEN is not set # CONFIG_SL_SYSCLK100 is not set # CONFIG_FB_CYBER2000 is not set @@ -887,6 +924,7 @@ CONFIG_FBCON_FONTS=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_6x11 is not set +# CONFIG_FONT_5x8 is not set CONFIG_FONT_4x6=y # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set @@ -921,6 +959,8 @@ CONFIG_SOUND=y # CONFIG_SOUND_PXA_AC97 is not set CONFIG_SOUND_POODLE=y # CONFIG_SOUND_CORGI is not set +# CONFIG_SOUND_TOSA is not set +# CONFIG_BUZZER_TOSA is not set # CONFIG_SOUND_TVMIXER is not set # @@ -945,6 +985,8 @@ CONFIG_USB=m # CONFIG_USB_UHCI_ALT is not set # CONFIG_USB_OHCI is not set # CONFIG_USB_OHCI_SA1111 is not set +# CONFIG_USB_OHCI_TC6393 is not set +# CONFIG_USB_USE_INTERNAL_MEMORY is not set # CONFIG_USB_AUDIO is not set # CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE_DEBUG is not set @@ -957,6 +999,11 @@ CONFIG_USB=m # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set +# CONFIG_USB_HID is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set # CONFIG_USB_SCANNER is not set @@ -1073,6 +1120,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y CONFIG_BLUEZ_BNEP=m CONFIG_BLUEZ_BNEP_MC_FILTER=y CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +# CONFIG_BLUEZ_HIDP is not set # # Bluetooth device drivers diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index acaeb5b189..548d87c1a2 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -7,7 +7,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r40" +PR = "r41" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ @@ -42,8 +42,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \ file://1764-1.patch;patch=1 \ file://module_licence.patch;patch=1 \ - file://iw249_we16-6.diff;patch=1 \ - file://iw249_we17-13.diff;patch=1 \ + http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \ + http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we17-13.diff;patch=1 \ file://ir240_sys_max_tx-2.diff;patch=1 \ file://ir241_qos_param-2.diff;patch=1 \ http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz \ diff --git a/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie index 531c7385e3..6f0bf1e10d 100644 --- a/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie +++ b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_ARM=y # CONFIG_EISA is not set @@ -46,10 +46,6 @@ CONFIG_ARCH_SA1100=y # # Archimedes/A5000 Implementations # - -# -# Archimedes/A5000 Implementations (select only ONE) -# # CONFIG_ARCH_ARC is not set # CONFIG_ARCH_A5K is not set @@ -146,10 +142,6 @@ CONFIG_ARCH_SHARP_SL=y # CONFIG_FOOTBRIDGE_ADDIN is not set CONFIG_CPU_32=y # CONFIG_CPU_26 is not set - -# -# Processor Type -# # CONFIG_CPU_32v3 is not set CONFIG_CPU_32v4=y # CONFIG_CPU_ARM610 is not set @@ -191,10 +183,6 @@ CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y - -# -# At least one math emulation must be selected -# CONFIG_FPE_NWFPE=y # CONFIG_FPE_FASTFPE is not set CONFIG_KCORE_ELF=y @@ -209,7 +197,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="See OE File" +CONFIG_CMDLINE="<see openzaurus-sa_*.bb file in OpenEmbedded metadata>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y @@ -234,10 +222,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_CACKO_HYBRID_PARTITIONS is not set # CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set - -# -# User Modules And Translation Layers -# CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -288,17 +272,10 @@ CONFIG_MTD_SA1100=y # CONFIG_MTD_PMC551 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_MTDROM_SA1100 is not set -CONFIG_MTD_MTDRAM_SA1100=y -CONFIG_MTDRAM_TOTAL_SIZE=16384 -CONFIG_MTDRAM_ERASE_SIZE=1 -CONFIG_MTDRAM_ABS_POS=C1000000 +# CONFIG_MTD_MTDRAM_SA1100 is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_MTDRAM_SHARP_SL is not set # CONFIG_MTD_BLKMTD is not set - -# -# Disk-On-Chip Device Drivers -# # CONFIG_MTD_DOC1000 is not set # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set @@ -418,10 +395,6 @@ CONFIG_IP6_NF_TARGET_MARK=m # CONFIG_KHTTPD is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -440,10 +413,6 @@ CONFIG_IP6_NF_TARGET_MARK=m # # CONFIG_NET_SCHED is not set CONFIG_IPSEC=m - -# -# IPSec options (Openswan) -# CONFIG_IPSEC_IPIP=y CONFIG_IPSEC_AH=y # CONFIG_IPSEC_AUTH_HMAC_MD5 is not set @@ -452,6 +421,8 @@ CONFIG_IPSEC_ESP=y CONFIG_IPSEC_ENC_3DES=y # CONFIG_IPSEC_ENC_AES is not set CONFIG_IPSEC_ALG=y +# CONFIG_IPSEC_ALG_AES is not set +# CONFIG_IPSEC_ALG_CRYPTOAPI is not set CONFIG_IPSEC_IPCOMP=y CONFIG_IPSEC_DEBUG=y @@ -525,10 +496,6 @@ CONFIG_NET_RADIO=y # CONFIG_AIRONET4500_PROC is not set # CONFIG_AIRO is not set # CONFIG_HERMES is not set - -# -# Wireless Pcmcia cards support -# # CONFIG_PCMCIA_HERMES is not set # CONFIG_AIRO_CS is not set CONFIG_NET_WIRELESS=y @@ -575,18 +542,10 @@ CONFIG_NET_PCMCIA_RADIO=y # IrDA (infrared) support # CONFIG_IRDA=y - -# -# IrDA protocols -# # CONFIG_IRLAN is not set CONFIG_IRNET=m CONFIG_IRCOMM=y # CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# # CONFIG_IRDA_CACHE_LAST_LSAP is not set CONFIG_IRDA_FAST_RR=y # CONFIG_IRDA_DEBUG is not set @@ -594,21 +553,9 @@ CONFIG_IRDA_FAST_RR=y # # Infrared-port device drivers # - -# -# SIR device drivers -# CONFIG_IRTTY_SIR=y CONFIG_IRPORT_SIR=y - -# -# Dongle support -# # CONFIG_DONGLE is not set - -# -# FIR device drivers -# # CONFIG_USB_IRDA is not set # CONFIG_NSC_FIR is not set # CONFIG_WINBOND_FIR is not set @@ -627,10 +574,6 @@ CONFIG_IDE=y # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y @@ -649,10 +592,6 @@ CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set - -# -# IDE chipset support/bugfixes -# # CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_CMD640_ENHANCED is not set # CONFIG_BLK_DEV_ISAPNP is not set @@ -686,12 +625,12 @@ CONFIG_BLK_DEV_IDECS=y # # Input core support # -# CONFIG_INPUT is not set -# CONFIG_INPUT_KEYBDEV is not set +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_UINPUT=m # # Character devices @@ -748,10 +687,6 @@ CONFIG_UNIX98_PTY_COUNT=32 # CONFIG_L3 is not set # CONFIG_L3_ALGOBIT is not set # CONFIG_L3_BIT_SA1100_GPIO is not set - -# -# Other L3 adapters -# # CONFIG_L3_SA1111 is not set # CONFIG_BIT_SA1100_GPIO is not set @@ -765,14 +700,32 @@ CONFIG_UNIX98_PTY_COUNT=32 # Joysticks # # CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +# CONFIG_INPUT_SERIO is not set +# CONFIG_INPUT_SERPORT is not set +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set # CONFIG_QIC02_TAPE is not set # @@ -1051,34 +1004,14 @@ CONFIG_SOUND_COLLIE_TC35143=y # CONFIG_USB=m # CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# # CONFIG_USB_DEVICEFS is not set # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_LONG_TIMEOUT is not set - -# -# USB Controllers -# # CONFIG_USB_UHCI is not set # CONFIG_USB_UHCI_ALT is not set # CONFIG_USB_OHCI is not set # CONFIG_USB_OHCI_SA1111 is not set - -# -# USB Device Class drivers -# # CONFIG_USB_AUDIO is not set - -# -# USB Bluetooth can only be used with disabled Bluetooth subsystem -# - -# -# SCSI support is needed for USB Storage -# # CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set @@ -1090,44 +1023,21 @@ CONFIG_USB=m # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set - -# -# USB Human Interface Devices (HID) -# - -# -# Input core support is needed for USB HID -# - -# -# USB Imaging devices -# +# CONFIG_USB_HID is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set # CONFIG_USB_SCANNER is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USB_HPUSBSCSI is not set - -# -# USB Multimedia devices -# - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# -# USB Network adaptors -# # CONFIG_USB_PEGASUS is not set # CONFIG_USB_KAWETH is not set # CONFIG_USB_CATC is not set # CONFIG_USB_CDCETHER is not set # CONFIG_USB_USBNET is not set - -# -# USB port drivers -# # CONFIG_USB_USS720 is not set # @@ -1160,10 +1070,6 @@ CONFIG_USB=m # CONFIG_USB_SERIAL_CYBERJACK is not set # CONFIG_USB_SERIAL_XIRCOM is not set # CONFIG_USB_SERIAL_OMNINET is not set - -# -# USB Miscellaneous drivers -# # CONFIG_USB_RIO500 is not set # @@ -1178,17 +1084,9 @@ CONFIG_USBD_USE_SERIAL_NUMBER=y CONFIG_USBD_SERIAL_NUMBER_STR="A01234" CONFIG_USBD_SELFPOWERED=y CONFIG_USBD_MONITOR=m - -# -# -# CONFIG_USBD_PROCFS=y # -# USB Device functions -# - -# # Network Function # CONFIG_USBD_NET=m @@ -1223,10 +1121,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE=64 # CONFIG_USBD_SERIAL_SAFE is not set # -# USB Device bus interfaces -# - -# # USB Device Bus Interface Support # CONFIG_USBD_SA1100_BUS=m diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index 63df6a88cf..62e9d31858 100644 --- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -6,7 +6,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20030509" -PR = "r21" +PR = "r22" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \ diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb new file mode 100644 index 0000000000..8a32b9cb70 --- /dev/null +++ b/packages/meta/openslug-native-packages.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware" +LICENSE = MIT +PR = "r2" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +# Just something the test with +OPENSLUG_NATIVE_PACKAGES = "\ + gzip \ + vlan \ + " + +BROKEN_PACKAGES = "\ + " + +DEPENDS = '${OPENSLUG_NATIVE_PACKAGES} \ + package-index' diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index bb5a68d01e..b52d2ef6eb 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,12 +1,13 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r7" +PR = "r10" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" OPENSLUG_NATIVE = "\ + autoconf \ automake \ bash \ binutils binutils-dev binutils-symlinks \ @@ -29,6 +30,7 @@ OPENSLUG_NATIVE = "\ libreadline4 libreadline-dev \ libstdc++-dev \ libthread-db1 \ + libtool \ lrzsz \ m4 \ make \ @@ -36,7 +38,9 @@ OPENSLUG_NATIVE = "\ ncurses ncurses-dev ncurses-terminfo \ patch \ perl perl-modules \ - python-core python-io python-lang python-pickle python-shell python-textutils \ + pkgconfig \ + python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \ + quilt \ sed \ tar \ util-linux \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7e248bc60e..a78f71002c 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,24 +34,20 @@ OPENSLUG_DEVELOPMENT = "\ openssh \ patch \ pciutils \ + perl \ pkgconfig \ quilt \ sed \ strace \ - util-linux \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc -OPENSLUG_DEVELOPMENT_append_linux = "\ - perl \ tar \ + util-linux \ " OPENSLUG_PACKAGES = "\ atftp \ bash \ + bind \ bluez-utils-nodbus \ bridge-utils \ bwmon \ @@ -60,70 +56,68 @@ OPENSLUG_PACKAGES = "\ cron \ cvs\ cyrus-imapd \ + db4 \ dnsmasq \ expat \ ftpd-topfield \ glib-2.0 \ gphoto2 \ gtk-doc \ + iperf \ + jpeg \ less \ + libpam \ + libpng \ libusb \ libxml2 \ + man man-pages \ + mgetty \ miau \ microcom \ + mpd \ mt-daapd \ mutt \ mysql \ nail \ nano \ ncftp \ + netpbm \ + nfs-utils \ + ntp \ obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ openssh \ openvpn \ pcre \ + php \ + postfix \ ppp \ procps \ + psmisc \ puppy \ pwc \ + python \ + reiserfsprogs reiser4progs \ rsync \ + samba \ + sane-backends \ + screen \ setpwc \ + strace \ + streamripper \ sudo \ sysfsutils \ thttpd \ - db4 \ - openldap \ - openntpd \ - ntp \ - reiserfsprogs reiser4progs \ - python \ - samba \ - sane-backends \ - strace \ thttpd \ + tiff \ + timezones \ + unionfs-modules unionfs-utils \ vlan \ wget \ - unionfs-modules unionfs-utils \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc (Note that for several this -# is because of use of single precision FP interfaces -# such as sinf.) -OPENSLUG_PACKAGES_append_linux = "\ - bind \ - man man-pages \ - mgetty \ - mpd \ - nfs-utils \ - libpam \ - php \ - postfix \ - psmisc \ - screen \ - streamripper \ - timezones \ xinetd \ yp-tools ypbind ypserv \ + zlib \ " BROKEN_PACKAGES = "\ diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb new file mode 100644 index 0000000000..afd029bc30 --- /dev/null +++ b/packages/meta/ucslugc-packages.bb @@ -0,0 +1,131 @@ +# Meta package containing all the packages which build for UcSlugC +# +# All packages in here must build with the ucslugc.conf distro, they +# do not necessarily work. +DESCRIPTION = "Packages that are compatible with the UcSlugC firmware" +LICENSE = MIT +PR = "r0" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +# The list of packages to build for the ucslugc DISTRO. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_PACKAGES = "\ + atftp \ + autoconf \ + automake \ + bash \ + bash \ + binutils \ + bison \ + bluez-utils-nodbus \ + bridge-utils \ + bwmon \ + bzip2 \ + ccxstream \ + coreutils \ + coreutils \ + cron \ + cvs \ + cvs\ + cyrus-imapd \ + db4 \ + diffutils \ + dnsmasq \ + expat \ + findutils \ + flex \ + ftpd-topfield \ + gawk \ + gcc \ + gdb \ + glib-2.0 \ + gnu-config \ + gphoto2 \ + grep \ + gtk-doc \ + gzip \ + ipkg-utils \ + less \ + libtool \ + libusb \ + libxml2 \ + lsof \ + m4 \ + make \ + miau \ + microcom \ + monotone-4 monotone-5 \ + mt-daapd \ + mutt \ + mysql \ + nail \ + nano \ + ncftp \ + ncurses \ + ntp \ + obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ + openssh \ + openssh \ + openvpn \ + patch \ + pciutils \ + pcre \ + pkgconfig \ + ppp \ + procps \ + puppy \ + pwc \ + python \ + quilt \ + reiserfsprogs reiser4progs \ + rsync \ + samba \ + sane-backends \ + sed \ + setpwc \ + strace \ + strace \ + sudo \ + sysfsutils \ + thttpd \ + thttpd \ + unionfs-modules unionfs-utils \ + util-linux \ + vlan \ + wget \ + " + +# These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_BROKEN_PACKAGES = "\ + bind \ + libpam \ + man man-pages \ + mgetty \ + mpd \ + perl \ + php \ + postfix \ + psmisc \ + screen \ + streamripper \ + tar \ + timezones \ + xinetd \ + " + +# These packages will never build because uclibc lacks (and always will lack) +# appropriate support. This define is for documentation of this fact! +UCSLUGC_UNSUPPORTABLE_PACKAGES = "\ + nfs-utils \ + yp-tools ypbind ypserv \ + " + +# The package-index at the end causes regeneration of the Packages.gz and +# other control files. +DEPENDS = "openslug-image ${UCSLUGC_PACKAGES} package-index" diff --git a/packages/netpbm/.mtn2git_empty b/packages/netpbm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netpbm/.mtn2git_empty diff --git a/packages/netpbm/files/.mtn2git_empty b/packages/netpbm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netpbm/files/.mtn2git_empty diff --git a/packages/netpbm/files/oeendiangen b/packages/netpbm/files/oeendiangen new file mode 100644 index 0000000000..b01e5e855b --- /dev/null +++ b/packages/netpbm/files/oeendiangen @@ -0,0 +1,30 @@ +#!/bin/sh +# +# This replaces 'endiangen' for OpenEmbedded. OE builds can rely on +# the GNU endian.h, however this generates __ names, (unless __USE_BSD +# is set) so we need to deal with this. Match the output of endiangen. +cat <<EOF +#ifndef OE_ENDIAN_H +#define OE_ENDIAN_H 1 +#include <ctype.h> +#include <endian.h> + +#ifndef LITTLE_ENDIAN +# define LITTLE_ENDIAN __LITTLE_ENDIAN +#endif +#ifndef BIG_ENDIAN +# define BIG_ENDIAN __BIG_ENDIAN +#endif +#ifndef PDP_ENDIAN +# define PDP_ENDIAN __PDP_ENDIAN +#endif +#ifndef BYTE_ORDER +# define BYTE_ORDER __BYTE_ORDER +#endif + +#ifndef BITS_PER_WORD +# include <bits/wordsize.h> +# define BITS_PER_WORD __WORDSIZE +#endif +#endif +EOF diff --git a/packages/netpbm/netpbm-10.28/.mtn2git_empty b/packages/netpbm/netpbm-10.28/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netpbm/netpbm-10.28/.mtn2git_empty diff --git a/packages/netpbm/netpbm-10.28/Makefile.config b/packages/netpbm/netpbm-10.28/Makefile.config new file mode 100644 index 0000000000..3407fcfd18 --- /dev/null +++ b/packages/netpbm/netpbm-10.28/Makefile.config @@ -0,0 +1,380 @@ +# This is the configuration file for OpenEmbedded +# It is a generic file for *all* architectures supported by +# OpenEmbedded. +# +# This is a make file inclusion, to be included in all the Netpbm make +# files. + +# This file is meant to contain variable settings that customize the +# build for a particular target system configuration. + +# The distribution contains the file Makefile.config.in. You edit +# Makefile.config.in in ways relevant to your particular environment +# to create Makefile.config. The "configure" program will do this +# for you in simple cases. + +# Some of the variables that the including make file must set for this +# file to work: +# +# SRCDIR: The directory at the top of the Netpbm source tree. Note that +# this is typically a relative directory, and it must be relative to the +# make file that includes this file. + +DEFAULT_TARGET = merge + +# Fiasco has some special requirements that make it fail to compile on +# some systems, and since it isn't very important, just set this to "N" +# and skip it on those systems unless you want to debug it and fix it. +# OpenBSD: +#BUILD_FIASCO = N +BUILD_FIASCO = Y + +# The following are commands for the build process to use. These values +# do not get built into anything. + +# The C compiler (including macro preprocessor) +#CC = gcc + +# The linker. +LD = $(CC) + +#If the linker identified above is a compiler that invokes a linker +#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is +#that we expect a compiler to take linker options in the '-Wl,-opt1,val1' +#syntax whereas the actual linker would take '-opt1 val1'. +LINKERISCOMPILER=Y + +#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can +#take a library as just another link object argument, as in 'ld +#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a +#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'. +#This variable controls how 'libopt' gets built. Note that with some +#linkers, you can specify a shared library explicitly, but then it has +#to live in that exact place at run time. That's not good enough for us. +LINKER_CAN_DO_EXPLICIT_LIBRARY=Y + +# This is the name of the header file that declares the types +# uint32_t, etc. This name is used as #include $(INTTYPES_H) . +# Set to null if the types come automatically without including anything. +INTTYPES_H = <inttypes.h> + +# HAVE_INT64 tells whether, assuming you include the header indicated by +# INTTYPES_H, you have the int64_t type and related stuff. (If you don't +# the build will omit certain code that does 64 bit computations). +HAVE_INT64 = Y + +# CC and LD are for building the Netpbm programs, which are not necessarily +# intended to run on the same system on which Make is running. But when we +# build a build tool such as Libopt, it is meant to run only on the same +# system on which the Make is running. The variables below define programs +# to use to compile and link build tools. +CC_FOR_BUILD = $(BUILD_CC) +LD_FOR_BUILD = $(BUILD_CC) + +# MAKE is set automatically by Make to what was used to invoke Make. + +INSTALL = install + +# STRIPFLAG is the option you pass to the above install program to make it +# strip unnecessary information out of binaries. +STRIPFLAG = -s + +SYMLINK = ln -s + +#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the +#pointer man pages are installed (ready to nroff, or ready to cat). +#A pointer man pages is just a single-paragraph pages that tells you there is +#no man page for the program, to look at the HTML documentation instead. +MANPAGE_FORMAT = nroff + +LEX = flex + +# EXE is a suffix that the linker puts on any executable it generates. +# In cygwin, this is .exe and most programs deal with its existence without +# us having to know about it. Some don't though, so set this: +EXE = + +# linker options. + +# Linker options for created Netpbm shared libraries. + +# Here, $(SONAME) resolves to the soname for the shared library being created. +# The following are gcc options. This works on GNU libc systems. +LDSHLIB = -shared -fpic -Wl,-soname,$(SONAME) + +# LDRELOC is the command to combine two .o files (relocateable object files) +# into a single .o file that can later be linked into something else. NONE +# means no such command is available. +LDRELOC = $(TARGET_LD) --reloc + +# On older systems, you have to make shared libraries out of position +# independent code, so you need -fpic or fPIC here. (The rule is: if +# -fpic works, use it. If it bombs, go to fPIC). On newer systems, +# it isn't necessary, but can save real memory at the expense of +# execution speed. Without position independent code, the library +# loader may have to patch addresses into the executable text. On an +# older system, this would cause a program crash because the loader +# would be writing into read-only shared memory. But on newer +# systems, the system silently creates a private mapping of the page +# or segment being modified (the "copy on write" phenomenon). So it +# needs its own private real page frame. In one experiment, A second +# copy of Pbmtext used 16K less real memory when built with -fpic than +# when built without. 2001.06.02. + +# We have seen -fPIC required on IA64 and AMD64 machines (GNU +# compiler/linker). Build-time linking fails without it. I don't +# know why -- history seems to be repeating itself. 2005.02.23. + +CFLAGS_SHLIB = -fpic + +# SHLIB_CLIB is the link option to include the C library in a shared library, +# normally "-lc". On typical systems, this serves no purpose. On some, +# though, it causes information about which C library to use to be recorded +# in the shared library and thus choose the correct library among several or +# avoid using an incompatible one. But on some systems, the link fails. +# On 2002.09.30, "John H. DuBois III" <spcecdt@armory.com> reports that on +# SCO OpenServer, he gets the following error message with -lc: +# +# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o); +# fatal error: relocations remain against allocatable but non-writable +# section: ; .text + +SHLIB_CLIB = + +# On some systems you have to build into an executable the list of +# directories where its dynamically linked libraries can be found at +# run time. This is typically done with a -R or -rpath linker +# option. Even on systems that don't require it, you might prefer to do +# that rather than set up environment variables or configuration files +# to tell the system where the libraries are. A "Y" here means to put +# the directory information in the executable at link time. +NEED_RUNTIME_PATH = Y + +# RPATHOPTNAME is the option you use on the link command to specify +# a runtime search path for a shared library. It is meaningless unless +# NEED_RUNTIME_PATH is Y. +RPATHOPTNAME = -rpath + +# The following variables tell where your various libraries on which +# Netpbm depends live. The LIBxxx variable is a full file +# specification of the link library (not necessarily the library used +# at run time). e.g. "/usr/local/lib/graphics/libpng.so". It usually +# doesn't matter if the library prefix and suffix are right -- you can +# use "lib" and ".so" or ".a" regardless of what your system actually +# uses because these just turn into "-L" and "-l" linker options +# anyway. ".a" implies a static library for some purposes, though. +# If you don't have the library in question, use a value of NONE for +# LIBxxx and the build will simply skip the programs that require that +# library. If the library is in your linker's (or the Netpbm build's) +# default search path, leave off the directory part, e.g. "libpng.so". + +# The xxxHDR_DIR variable is the directory in which the interface +# headers for the library live (e.g. /usr/include). If they are in your +# compiler's default search path, set this variable to null. + +# This is where the Netpbm shared libraries will reside when Netpbm is +# fully installed. In some configurations, the Netpbm builder builds +# this information into the Netpbm executables. This does NOT affect +# where the Netpbm installer installs the libraries. A null value +# means the libraries are in a default search path used by the runtime +# library loader. +NETPBMLIB_RUNTIME_PATH = $(libdir) +#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm + +# The TIFF library. See above. If you want to build the tiff +# converters, you must have the tiff library already installed. + +TIFFLIB = libtiff.so +TIFFHDR_DIR = + +# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any +# program linked with the TIFF library needs a Jpeg and/or Z library. +# Some TIFF libraries have such library statically linked in, but others +# need it to be dynamically linked at program load time. +# Make this 'N' if youf TIFF library doesn't need such dynamic linking. +# As of 2005.01, the most usual build of the TIFF library appears to require +# both. +TIFFLIB_NEEDS_JPEG = Y +TIFFLIB_NEEDS_Z = Y + +# The JPEG library. See above. If you want to build the jpeg +# converters you must have the jpeg library already installed. + +# Tiff files can use JPEG compression, so the Tiff library can reference +# the JPEG library. If your Tiff library references a dynamic JPEG +# library, you must specify at least JPEGLIB here, or the Tiff +# converters will not build. Note that your Tiff library may have the +# JPEG stuff statically linked in, in which case you won't need +# JPEGLIB in order to build the Tiff converters. + +JPEGLIB = libjpeg.so +JPEGHDR_DIR = + +# The PNG library. See above. If you want to build the PNG +# converters you must have the PNG library already installed. + +# The PNG library, by convention starting around April 2002, gets installed +# with names that include a version number, such as libpng10.a and header +# files in /usr/include/libpng10. +# option. +PNGLIB = libpng.so +PNGHDR_DIR = +PNGVER = + +# The zlib compression library. See above. You need it to build +# anything that needs the PNG library (see above). If you selected +# NONE for the PNG library, it doesn't matter what you specify here -- +# it won't get used. +ZLIB = libz.so +ZHDR_DIR = + +# The JBIG lossless image compression library (aka JBIG-KIT): +JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a +JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig + +# The Jasper JPEG-2000 image compression library (aka JasPer): +JASPERLIB = $(INTERNAL_JASPERLIB) +JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) +# JASPERDEPLIBS is the libraries (-l options or file names) on which +# The Jasper library depends -- i.e. what you have to link into any +# executable that links in the Jasper library. +JASPERDEPLIBS = +#JASPERDEPLIBS = -ljpeg + +# And the Utah Raster Toolkit (aka URT aka RLE) library: +URTLIB = $(BUILDDIR)/urt/librle.a +URTHDR_DIR = $(SRCDIR)/urt + +# The Linux SVGA library (Svgalib) is a facility for displaying graphics +# on the Linux console. It is required by Ppmsvgalib. +LINUXSVGALIB = NONE +LINUXSVGAHDR_DIR = + +# If you don't want any network functions, set OMIT_NETWORK to "y". +# The only thing that requires network functions is the option in +# ppmtompeg to run it on multiple computers simultaneously. On some +# systems network functions don't work or we haven't figured out how to +# make them work, or they just aren't worth the effort. +OMIT_NETWORK = + +# These are -l options to link in the network libraries. Often, these are +# built into the standard C library, so this can be null. This is irrelevant +# if OMIT_NETWORK is "y". +NETWORKLD = + +VMS = +#VMS: +#VMS = yes + +# The following variables are used only by 'make install' (and the +# variants of it). Paths here don't, for example, get built into any +# programs. + +# This is where everything goes when you do 'make package', unless you +# override it by setting 'pkgdir' on the Make command line. +PKGDIR_DEFAULT = /tmp/netpbm + +# File permissions for installed files. +# Note that on some systems (e.g. Solaris), 'install' can't use the +# mnemonic permissions - you have to use octal. + +# binaries (pbmmake, etc) +INSTALL_PERM_BIN = 755 # u=rwx,go=rx +# shared libraries (libpbm.so, etc) +INSTALL_PERM_LIBD = 755 # u=rwx,go=rx +# static libraries (libpbm.a, etc) +INSTALL_PERM_LIBS = 644 # u=rw,go=r +# header files (pbm.h, etc) +INSTALL_PERM_HDR = 644 # u=rw,go=r +# man pages (pbmmake.1, etc) +INSTALL_PERM_MAN = 644 # u=rw,go=r +# data files (pnmtopalm color maps, etc) +INSTALL_PERM_DATA = 644 # u=rw,go=r + +# Specify the suffix that want the man pages to have. + +SUFFIXMANUALS1 = 1 +SUFFIXMANUALS3 = 3 +SUFFIXMANUALS5 = 5 + +#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the +#Netpbm library functions. The value is used only in make file tests. +# "unixshared" means a unix-style shared library, typically named like +# libxyz.so.2.3 +NETPBMLIBTYPE = unixshared +# "unixstatic" means a unix-style static library, (like libxyz.a) +#NETPBMLIBTYPE = unixstatic +# "dll" means a Windows DLL shared library +#NETPBMLIBTYPE = dll +# "dylib" means a Darwin/Mac OS shared library +#NETPBMLIBTYPE = dylib + +#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is +#selected above. All this is used for is to construct library names. +#The make files never examine the actual value. +NETPBMLIBSUFFIX = so + +# "a" is the suffix for unix-style static libraries. It is also +# traditionally used for shared libraries on AIX. The Visual Age C +# manual says sometimes .so works on AIX, and GNU software for AIX +# 5.1.0 does indeed use it. In our experiments, it works fine if you +# name the library file explicitly on the link, but isn't in the -l +# search order. If you name the library explicitly on the link, the +# library must live in exactly the same position at run time, so we +# can't use that. Therefore, you cannot build both static and shared +# libraries with AIX. You have to choose. +#NETPBMLIBSUFFIX = a +# For HP-UX shared libraries: +#NETPBMLIBSUFFIX = sl +# Darwin/Mac OS shared library: +#NETPBMLIBSUFFIX = dylib +# Windows shared library: +#NETPBMLIBSUFFIX = dll + +#STATICLIB_TOO is "y" to signify that you want a static library built +#and installed in addition to whatever library type you specified by +#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, +#STATICLIB_TOO simply has no effect. +STATICLIB_TOO = y +#STATICLIB_TOO = n + +#STATICLIBSUFFIX is the suffix that static libraries have. It's +#meaningless if you aren't building static libraries. +STATICLIBSUFFIX = a + +#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename +#of a shared library may have on this system. Traditionally, it's +#just "lib", as in libc or libnetpbm. On Windows, though, varying +#prefixes are used when multiple alternative forms of a library are +#available. The first prefix in this list is what we use to name the +#Netpbm shared libraries. +# +# This variable controls how 'libopt' gets built. +# +SHLIBPREFIXLIST = lib + +NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST)) + +#DLLVER is used to version the DLLs built on cygwin or other +#windowsish platforms. We can't add this to LIBROOT, or we'd +#version the static libs (which is bad). We can't add this +#at the end of the name (like unix does with so numbers) because +#windows will only load dlls whose name ends in "dll". So, +#we have this variable, which becomes the end of the library "root" name +#for DLLs only. +# +# This variable controls how 'libopt' gets built. +# +DLLVER = +#Cygwin +#DLLVER = $(NETPBM_MAJOR_RELEASE) + +#NETPBM_DOCURL is the URL of the main documentation page for Netpbm. +#This is a directory which contains a file for each Netpbm program, +#library, and file type. E.g. The documentation for jpegtopnm might be in +#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets +#installed in the man pages (which say no more than to read the webpage) +#and in the Webman netpbm.url file. +NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ +#For a system with no web access, but a local copy of the doc: +#NETPBM_DOCURL = file:/usr/doc/netpbm/ diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb new file mode 100644 index 0000000000..b4f78a57a1 --- /dev/null +++ b/packages/netpbm/netpbm_10.28.bb @@ -0,0 +1,78 @@ +# bitbake configuration file for NetPBM, a command line image (sampled +# data) processing package derived from PBMPlus +# +# For documentation see: http://netpbm.sourceforge.net/doc/ +LICENSE = "GPL MIT Artistic" +# NOTE: individual command line utilities are covered by different +# licenses. The compiled and linked command line utilties are +# subject to the licenses of the libraries they use too - including +# libpng libz, IJG, and libtiff licenses + +SECTION = "console/utils" +DEPENDS = "jpeg zlib libpng tiff install-native flex-native" +RDEPENDS = "perl" +HOMEPAGE = "http://netpbm.sourceforge.net" +DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\ +conversion of images between a variety of different formats. There\ +are over 220 separate tools in the package including converters for\ +about 100 graphics formats." +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \ + file://Makefile.config \ + file://oeendiangen" + +EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD}" + +do_configure() { + install -c -m 644 ../Makefile.config . + # The following stops the host endiangen program being run and uses + # the target endian.h header instead. + install -c -m 755 ../oeendiangen buildtools +} + +do_compile() { + # need all to get the static library too + oe_runmake all default +} + +do_install() { + # netpbm makes its own installation package, which must then be + # installed to form the dummy installation for ipkg + rm -rf ${WORKDIR}/netpbm-package + oe_runmake package pkgdir=${WORKDIR}/netpbm-package + # now install the stuff from the package into ${D} + for d in ${WORKDIR}/netpbm-package/* + do + # following will cause an error if used + case "$d" in + */README) ;; + */VERSION) ;; + */pkginfo) ;; + */bin) install -d ${D}${bindir} + cp -a "$d"/* ${D}${bindir} + rm ${D}${bindir}/doc.url;; + */include) install -d ${D}${includedir} + cp -a "$d"/* ${D}${includedir};; + */link|*/lib) install -d ${D}${libdir} + cp -a "$d"/* ${D}${libdir};; + */man) install -d ${D}${mandir} + cp -a "$d"/* ${D}${mandir};; + */misc) install -d ${D}${datadir}/netpbm + cp -a "$d"/* ${D}${datadir}/netpbm;; + */config_template) + install -d ${D}${bindir} + sed "/^@/d + s!@VERSION@!$(<'${WORKDIR}/netpbm-package/VERSION')! + s!@DATADIR@!${datadir}/netpbm! + s!@LIBDIR@!${libdir}! + s!@LINKDIR@!${libdir}! + s!@INCLUDEDIR@!${includedir}! + s!@BINDIR@!${bindir}! + " "$d" >${D}${bindir}/netpbm-config + chmod 755 ${D}${bindir}/netpbm-config;; + *) echo "netpbm-package/$d: unknown item" >&2 + exit 1;; + esac + done +} diff --git a/packages/nonworking/crimsonfields/crimsonfields_0.4.6.bb b/packages/nonworking/crimsonfields/crimsonfields_0.4.6.bb deleted file mode 100644 index 0674506547..0000000000 --- a/packages/nonworking/crimsonfields/crimsonfields_0.4.6.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Crimson Fields is a tactical war game in the tradition of Battle Isle." -SECTION = "games" -PRIORITY = "optional" -DEPENDS = "virtual/libsdl libsdl-mixer libsdl-ttf" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL" - -SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2" -S = "${WORKDIR}/crimson-${PV}" - -inherit autotools - -do_configure() { - gnu-configize - oe_runconf -} - -do_compile() { - cd tools && oe_runmake \ - CC="${BUILD_CC}" CXX="${BUILD_CXX}" LD="${BUILD_CCLD}" \ - CFLAGS="${BUILD_CFLAGS}" CXXFLAGS="${BUILD_CXXFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" - cd ${S} && oe_runmake -} - -# FIXME: Add .desktop file for Opie/Qtopia diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb index bb2997eb0b..3ca809f002 100644 --- a/packages/openntpd/openntpd_3.7p1.bb +++ b/packages/openntpd/openntpd_3.7p1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD" SECTION = "console/network" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "timezones" -PR="r6" +PR="r7" SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -19,7 +19,7 @@ INITSCRIPT_NAME = "openntpd" INITSCRIPT_PARAMS = "defaults" -inherit autotools +inherit autotools update-rc.d EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \ --sysconfdir=/etc --with-privsep-path=/var/shared/empty \ diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index e3f78c2de5..47225eb532 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -11,7 +11,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -PR = "r1" +PR = "r4" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -46,11 +46,13 @@ do_compile_append () { do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd + mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh + mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh } PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc" -FILES_openssh-scp = "${bindir}/scp" -FILES_openssh-ssh = "${bindir}/ssh ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" +FILES_openssh-scp = "${bindir}/scp.${PN}" +FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd" FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server" @@ -65,10 +67,18 @@ if test "x$D" != "x"; then else addgroup sshd adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd - update-rc.d sshd defaults + update-rc.d sshd defaults 9 fi } +pkg_postinst_openssh-scp() { + update-alternatives --install ${bindir}/scp scp scp.${PN} 90 +} + +pkg_postinst_openssh-ssh() { + update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 +} + pkg_postrm_openssh-sshd() { if test "x$D" != "x"; then exit 1 diff --git a/packages/perl/files/config.sh-mipsel-linux b/packages/perl/files/config.sh-mipsel-linux index 299b0441ed..eedf443f04 100644 --- a/packages/perl/files/config.sh-mipsel-linux +++ b/packages/perl/files/config.sh-mipsel-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.3/mipsel-linux' -archlibexp='/usr/lib/perl5/5.8.3/mipsel-linux' +archlib='/usr/lib/perl5/5.8.4/mipsel-linux' +archlibexp='/usr/lib/perl5/5.8.4/mipsel-linux' archname64='' archname='mips-linux' archobjs='' @@ -668,7 +668,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.3/mipsel-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.4/mipsel-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -676,13 +676,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.3' +installprivlib='./install_me_here/usr/lib/perl5/5.8.4' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.3' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -809,8 +809,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.3' -privlibexp='/usr/lib/perl5/5.8.3' +privlib='/usr/lib/perl5/5.8.4' +privlibexp='/usr/lib/perl5/5.8.4' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -871,8 +871,8 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0' sig_size='131' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' @@ -962,6 +962,7 @@ uselongdouble='undef' usemorebits='undef' usemultiplicity='undef' usemymalloc='n' +usemallocwrap='define' usenm='false' useopcode='true' useperlio='define' @@ -1000,13 +1001,13 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.3' +version='5.8.4' version_patchlevel_string='version 8 subversion 3' versiononly='undef' vi='' voidflags='15' xlibpth='/usr/lib/386 /lib/386' -xs_apiversion='5.8.3' +xs_apiversion='5.8.4' yacc='yacc' yaccflags='' zcat='' @@ -1022,5 +1023,4 @@ PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=8 PERL_API_SUBVERSION=0 -PERL_PATCHLEVEL= -PERL_CONFIG_SH=true +PERL_PATCHLEVELPERL_CONFIG_SH=true diff --git a/packages/perl/perl-5.8.7/config.sh-i386-linux b/packages/perl/perl-5.8.7/config.sh-i386-linux index fda13d0d9b..ee989f66bb 100644 --- a/packages/perl/perl-5.8.7/config.sh-i386-linux +++ b/packages/perl/perl-5.8.7/config.sh-i386-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.4/i386-linux' -archlibexp='/usr/lib/perl5/5.8.4/i386-linux' +archlib='/usr/lib/perl5/5.8.7/i386-linux' +archlibexp='/usr/lib/perl5/5.8.7/i386-linux' archname64='' archname='i386-linux' archobjs='' @@ -55,7 +55,7 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-fpic' -ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i386-linux/CORE' +ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.7/i386-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='gcc' @@ -435,6 +435,8 @@ d_strerrm='strerror(e)' d_strerror='define' d_strerror_r='undef' d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' d_strtod='define' d_strtol='define' d_strtold='define' @@ -669,7 +671,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i386-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.7/i386-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -677,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.4' +installprivlib='./install_me_here/usr/lib/perl5/5.8.7' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i386-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/i386-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -809,8 +811,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.4' -privlibexp='/usr/lib/perl5/5.8.4' +privlib='/usr/lib/perl5/5.8.7' +privlibexp='/usr/lib/perl5/5.8.7' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -871,17 +873,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' sig_size='69' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.4/i386-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i386-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.7/i386-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.7/i386-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.8.4' +sitelib='/usr/lib/perl5/site_perl/5.8.7' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.8.4' +sitelibexp='/usr/lib/perl5/site_perl/5.8.7' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1002,7 +1004,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.4' +version='5.8.7' version_patchlevel_string='version 8 subversion 4' versiononly='undef' vi='' diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux index 313ff2fbb1..7d5a531266 100644 --- a/packages/perl/perl-5.8.7/config.sh-i686-linux +++ b/packages/perl/perl-5.8.7/config.sh-i686-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.4/i686-linux' -archlibexp='/usr/lib/perl5/5.8.4/i686-linux' +archlib='/usr/lib/perl5/5.8.7/i686-linux' +archlibexp='/usr/lib/perl5/5.8.7/i686-linux' archname64='' archname='i686-linux' archobjs='' @@ -55,7 +55,7 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-fpic' -ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i686-linux/CORE' +ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.7/i686-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='gcc' @@ -435,6 +435,8 @@ d_strerrm='strerror(e)' d_strerror='define' d_strerror_r='undef' d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' d_strtod='define' d_strtol='define' d_strtold='define' @@ -669,7 +671,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i686-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.7/i686-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -677,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.4' +installprivlib='./install_me_here/usr/lib/perl5/5.8.7' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i686-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/i686-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -809,8 +811,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.4' -privlibexp='/usr/lib/perl5/5.8.4' +privlib='/usr/lib/perl5/5.8.7' +privlibexp='/usr/lib/perl5/5.8.7' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -871,17 +873,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' sig_size='69' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.4/i686-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i686-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.7/i686-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.7/i686-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.8.4' +sitelib='/usr/lib/perl5/site_perl/5.8.7' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.8.4' +sitelibexp='/usr/lib/perl5/site_perl/5.8.7' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1002,7 +1004,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.4' +version='5.8.7' version_patchlevel_string='version 8 subversion 4' versiononly='undef' vi='' diff --git a/packages/perl/perl-5.8.7/config.sh-mipsel-linux b/packages/perl/perl-5.8.7/config.sh-mipsel-linux index fa5f0a5b47..7696a3dff0 100644 --- a/packages/perl/perl-5.8.7/config.sh-mipsel-linux +++ b/packages/perl/perl-5.8.7/config.sh-mipsel-linux @@ -36,8 +36,8 @@ api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/usr/lib/perl5/5.8.3/mipsel-linux' -archlibexp='/usr/lib/perl5/5.8.3/mipsel-linux' +archlib='/usr/lib/perl5/5.8.7/mipsel-linux' +archlibexp='/usr/lib/perl5/5.8.7/mipsel-linux' archname64='' archname='mips-linux' archobjs='' @@ -435,6 +435,8 @@ d_strerrm='strerror(e)' d_strerror='define' d_strerror_r='undef' d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' d_strtod='define' d_strtol='define' d_strtold='define' @@ -669,7 +671,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.8.3/mipsel-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.8.7/mipsel-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -677,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.8.3' +installprivlib='./install_me_here/usr/lib/perl5/5.8.7' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/mipsel-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.3' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -810,8 +812,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.8.3' -privlibexp='/usr/lib/perl5/5.8.3' +privlib='/usr/lib/perl5/5.8.7' +privlibexp='/usr/lib/perl5/5.8.7' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -872,8 +874,8 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0' sig_size='131' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux' +sitearch='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' @@ -963,6 +965,7 @@ uselongdouble='undef' usemorebits='undef' usemultiplicity='undef' usemymalloc='n' +usemallocwrap='define' usenm='false' useopcode='true' useperlio='define' @@ -1002,13 +1005,13 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.8.3' -version_patchlevel_string='version 8 subversion 3' +version='5.8.7' +version_patchlevel_string='version 8 subversion 7' versiononly='undef' vi='' voidflags='15' xlibpth='/usr/lib/386 /lib/386' -xs_apiversion='5.8.3' +xs_apiversion='5.8.7' yacc='yacc' yaccflags='' zcat='' diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 3500ca57bd..b5d25257bb 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -5,7 +5,7 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-i386-linux" -PR = "r10" +PR = "r12" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl diff --git a/packages/procps/procps-3.2.5/install.patch b/packages/procps/procps-3.2.5/install.patch index a05eec4ab6..9f1ef6915d 100644 --- a/packages/procps/procps-3.2.5/install.patch +++ b/packages/procps/procps-3.2.5/install.patch @@ -1,25 +1,27 @@ -*** procps-3.2.5/Makefile.orig Sun Jul 24 03:29:32 2005 ---- procps-3.2.5/Makefile Sun Jul 24 03:30:14 2005 -*************** -*** 211,220 **** - ###### install - - $(BINFILES) : all -! $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all -! $(install) --mode a=r $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice ---- 211,220 ---- - ###### install - - $(BINFILES) : all -! $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -! $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice +--- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 ++++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 +@@ -30,7 +30,10 @@ + install := install -D --owner 0 --group 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++# lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++ ++# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. ++lib64 := lib + + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ +@@ -211,10 +214,10 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) -m 555 $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) -m 444 $(notdir $@) $@ + + install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) + cd $(usr/bin) && $(ln_f) skill snice diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb index 51e37a106b..21b2783e55 100644 --- a/packages/procps/procps_3.2.5.bb +++ b/packages/procps/procps_3.2.5.bb @@ -7,7 +7,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DEPENDS = "ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ file://install.patch;patch=1 \ diff --git a/packages/qt/qt-x11-free_3.3.3.bb b/packages/qt/qt-x11-free_3.3.3.bb index 8304de1461..1aaef72d1c 100644 --- a/packages/qt/qt-x11-free_3.3.3.bb +++ b/packages/qt/qt-x11-free_3.3.3.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql" -PR = "r6" +PR = "r8" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ @@ -24,6 +24,7 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"' do_configure() { @@ -35,6 +36,8 @@ do_configure() { find . -name "Makefile"|xargs rm -f (cd src && qmake -spec ${QMAKESPEC} ) (cd plugins/src && qmake -spec ${QMAKESPEC} ) + (cd tools && qmake -spec ${QMAKESPEC} ) + (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) } do_compile() { @@ -42,6 +45,8 @@ do_compile() { unset CXXFLAGS oe_runmake -C src ${EXTRA_ENV} oe_runmake -C plugins/src ${EXTRA_ENV} + oe_runmake -C tools ${EXTRA_ENV} + oe_runmake -C tools/qvfb ${EXTRA_ENV} } do_stage() { @@ -56,14 +61,27 @@ do_stage() { do install -m 0644 $f ${STAGING_QT_DIR}/include/private done + for f in lib/*.prl + do + install -m 0644 $f ${STAGING_QT_DIR}/lib + done } do_install() { install -d ${D}${libdir}/ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ - oe_runmake -C plugins/src INSTALL_ROOT="${D}" ${EXTRA_ENV} install + install -d ${D}${bindir}/ + install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} + install -d ${D}${prefix}/plugins/ + cp -a plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ } -PACKAGES += "qt-x11-plugins" -FILES_qt-x11-plugins = "${prefix}/plugins" - +PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" +FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" +FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" +FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" +FILES_qt-x11-designer = "${bindir}/designer" +FILES_qt-x11-assistant = "${bindir}/assistant" +FILES_qt-x11-qvfb = "${bindir}/qvfb" +FILES_qt-x11-qtconfig = "${bindir}/qtconfig" diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index dbc85efb44..c008fe27f5 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r12" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -10,13 +10,14 @@ SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ S := ${WORKDIR}/${P}/source include samba.inc +inherit update-rc.d INITSCRIPT_NAME = "samba" # No dependencies, goes in at level 20 (NOTE: take care with the # level, later levels put the shutdown later too - see the links # in rc6.d, the shutdown must precede network shutdown). INITSCRIPT_PARAMS = "defaults" -#CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" +CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" # The file system settings --foodir=dirfoo and overridden unconditionally # in the samba config by --with-foodir=dirfoo - even if the --with is not diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb index b53e1b3127..bbb02199a7 100644 --- a/packages/thttpd/thttpd_2.25b.bb +++ b/packages/thttpd/thttpd_2.25b.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server." LICENSE = "BSD" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://www.acme.com/software/thttpd/" -PR="r4" +PR="r5" SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \ file://install.patch;patch=1 \ @@ -13,7 +13,7 @@ S = "${WORKDIR}/thttpd-${PV}" INITSCRIPT_NAME = "thttpd" INITSCRIPT_PARAMS = "defaults" -inherit autotools +inherit autotools update-rc.d EXTRA_OEMAKE += "'WEBDIR=${servicedir}/www'" FILES_${PN}_append = " ${servicedir}" diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb deleted file mode 100644 index 521d47697e..0000000000 --- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -# xfce-mcs-manager OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Settings manager." - -DEPENDS="libxfcegui4 libxfce4mcs" - -inherit xfce - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4 - install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager - install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager -} - -# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live -# the standard pkgconfig mangling was confusing us. Mangling is not required -# for this particular .pc, so the following will suffice: - -do_stage_append () { - install -d ${PKG_CONFIG_PATH} - install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc -} diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc index 14dfe175ea..b5b4505e98 100644 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc +++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc @@ -2,8 +2,11 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="Common XFCE4 configuration plugins." -DEPENDS="libxfcegui4 xfce-mcs-manager gtk+" -SECTION="x11" +DESCRIPTION = "Common XFCE4 configuration plugins." +DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" +SECTION = "x11" inherit xfce + +PACKAGES += "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb deleted file mode 100644 index 92046c0b81..0000000000 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="Common XFCE4 configuration plugins." -DEPENDS="libxfcegui4 xfce-mcs-manager gtk+" -inherit xfce diff --git a/packages/xfce-utils/xfce-utils_4.2.0.bb b/packages/xfce-utils/xfce-utils_4.2.0.bb deleted file mode 100644 index 8498cbf088..0000000000 --- a/packages/xfce-utils/xfce-utils_4.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -PR="r1" - -DESCRIPTION="XFCE4 Utilities" -DEPENDS="x11 libxfcegui4 xfce-mcs-manager" -inherit xfce - -FILES_${PN} += " /usr/share/xfce4/AUTHORS \ - /usr/share/xfce4/BSD \ - /usr/share/xfce4/COPYING \ - /usr/share/xfce4/GPL \ - /usr/share/xfce4/INFO \ - /usr/share/xfce4/LGPL \ - /usr/share/xfce4/AUTHORS.html \ - /usr/share/xfce4/BSD.html \ - /usr/share/xfce4/COPYING.html \ - /usr/share/xfce4/GPL.html \ - /usr/share/xfce4/INFO.html \ - /usr/share/xfce4/LGPL.html" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb deleted file mode 100644 index 0d102f3bd0..0000000000 --- a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE Application Finder" -SECTION = "x11" -inherit xfce -DEPENDS="libxfcegui4" diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb deleted file mode 100644 index a923489f32..0000000000 --- a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# xfce-mixer-plugin OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE panel mixer plugin" -SECTION = "x11" - -DEPENDS="xfce4-panel" -inherit xfce diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc index 4950da6f68..30473eea06 100644 --- a/packages/xfce4-panel/xfce4-panel.inc +++ b/packages/xfce4-panel/xfce4-panel.inc @@ -2,17 +2,14 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE4 Panel" +DESCRIPTION = "XFCE4 Panel" SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" +DEPENDS = "startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + inherit pkgconfig xfce EXTRA_OECONF += " --enable-startup-notification" -do_install() { - oe_runmake DESTDIR=${D} install -} - HEADERS="controls.h global.h icons.h main.h panel.h item.h \ item_dialog.h plugins.h xfce_support.h xfce.h" @@ -23,3 +20,10 @@ do_stage() { install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file done } + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" diff --git a/packages/xfce4-panel/xfce4-panel_4.2.0.bb b/packages/xfce4-panel/xfce4-panel_4.2.0.bb deleted file mode 100644 index 4950da6f68..0000000000 --- a/packages/xfce4-panel/xfce4-panel_4.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce4-panel OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Panel" -SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" -inherit pkgconfig xfce - -EXTRA_OECONF += " --enable-startup-notification" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -HEADERS="controls.h global.h icons.h main.h panel.h item.h \ - item_dialog.h plugins.h xfce_support.h xfce.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/panel - - for file in ${HEADERS}; do - install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file - done -} |