diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-03-19 20:46:15 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-03-19 20:46:15 +0000 |
| commit | 067e0f8bdbfdff629f87c2503188bc47f423e3d9 (patch) | |
| tree | eba5238effafb90f10513f7c685a6f135a357910 | |
| parent | c4d82fea50859bb406c78da5942aa565a37e2839 (diff) | |
| parent | e331cce33abbcf242f8c8fa1dd152ca4ca3f7eb9 (diff) | |
merge of '51282322cfa3cd938fb47ab1b7038c115d8024d8'
and 'c6af65fae3cef86de384e1203d97c909460bf4fa'
62 files changed, 990 insertions, 186 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass index f20c1f8b60..59f2771027 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -22,11 +22,12 @@ export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config" export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config" -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} +#do_compile_prepend() { +# find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +# find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' +#} -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes" +PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev" FILES_${PN} = "${libdir}/lib*.so*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" +FILES_${PN}-dev += "${includedir}"
\ No newline at end of file diff --git a/packages/base-files/base-files/oplinux-uclibc/.mtn2git_empty b/packages/base-files/base-files/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/.mtn2git_empty diff --git a/packages/base-files/base-files/oplinux-uclibc/issue b/packages/base-files/base-files/oplinux-uclibc/issue new file mode 100644 index 0000000000..9d0ef9c636 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/issue @@ -0,0 +1,14 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + .--.--.-----.--. .--.-----.-----. + | | | __| | | | -- | __| + | | | '-| | -- | | + '-----'-----'----'--'-----'-----' + +The OPLinux-uclibc distribution \l + diff --git a/packages/base-files/base-files/oplinux-uclibc/issue.net b/packages/base-files/base-files/oplinux-uclibc/issue.net new file mode 100644 index 0000000000..b74869dba1 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/issue.net @@ -0,0 +1,16 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + .--.--.-----.--. .--.-----.-----. + | | | __| | | | -- | __| + | | | '-| | -- | | + '-----'-----'----'--'-----'-----' + + +The OPLinux-uclibc distribution %h + + diff --git a/packages/base-files/base-files/oplinux-uclibc/motd b/packages/base-files/base-files/oplinux-uclibc/motd new file mode 100644 index 0000000000..5fad7d5707 --- /dev/null +++ b/packages/base-files/base-files/oplinux-uclibc/motd @@ -0,0 +1,12 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + .--.--.-----.--. .--.-----.-----. + | | | __| | | | -- | __| + | | | '-| | -- | | + '-----'-----'----'--'-----'-----' + diff --git a/packages/base-files/base-files/oplinux/.mtn2git_empty b/packages/base-files/base-files/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/oplinux/.mtn2git_empty diff --git a/packages/base-files/base-files/oplinux/issue b/packages/base-files/base-files/oplinux/issue new file mode 100644 index 0000000000..9b9c437510 --- /dev/null +++ b/packages/base-files/base-files/oplinux/issue @@ -0,0 +1,10 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + +The OPLinux distribution \l + diff --git a/packages/base-files/base-files/oplinux/issue.net b/packages/base-files/base-files/oplinux/issue.net new file mode 100644 index 0000000000..93a6f8a7d5 --- /dev/null +++ b/packages/base-files/base-files/oplinux/issue.net @@ -0,0 +1,11 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + +The OPLinux distribution %h + + diff --git a/packages/base-files/base-files/oplinux/motd b/packages/base-files/base-files/oplinux/motd new file mode 100644 index 0000000000..10e458b9b5 --- /dev/null +++ b/packages/base-files/base-files/oplinux/motd @@ -0,0 +1,8 @@ +.-------.-------. .---. .---. .---. .---. +| | __ | | | '---' \ \/ / +| | | | | | .---.-----.--.--.\ / +| | | .---' | '--| | | | |/ \ +| | | | | | | | | /\ \ +'-------'---' '------'---'--'--'-----'--' '---' +===================================================== + diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 0f80f17b19..1cf58d7ebb 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r62" +PR = "r63" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/e17/e-wm_0.16.999.037.bb b/packages/e17/e-wm_0.16.999.037.bb index 3084fd99bc..0ccd0c67f2 100644 --- a/packages/e17/e-wm_0.16.999.037.bb +++ b/packages/e17/e-wm_0.16.999.037.bb @@ -1,7 +1,7 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" DEPENDS = "evas-x11 ecore-x11 edje eet embryo" LICENSE = "MIT" -PR = "r4" +PR = "r5" inherit e update-alternatives @@ -23,7 +23,9 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR}" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" +FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset" +FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la" +FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb index c66639d25e..1dc5c1de10 100644 --- a/packages/efl/edje-native_0.5.0.037.bb +++ b/packages/efl/edje-native_0.5.0.037.bb @@ -13,7 +13,7 @@ do_configure_prepend() { } do_stage_append() { - edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + edje_data_dir=`edje-config --datadir` # could also use ${STAGING_DATADIR}/edje/include install -d $edje_data_dir/include install -m 0644 data/include/edje.inc $edje_data_dir/include diff --git a/packages/efl/evas-fb_0.9.9.037.bb b/packages/efl/evas-fb_0.9.9.037.bb index 3e29b80cc0..4acc857982 100644 --- a/packages/efl/evas-fb_0.9.9.037.bb +++ b/packages/efl/evas-fb_0.9.9.037.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r5" +PR = "r6" EXTRA_OECONF = "--enable-fb \ --disable-directfb \ diff --git a/packages/efl/evas-x11_0.9.9.037.bb b/packages/efl/evas-x11_0.9.9.037.bb index 121922591e..765a8b73d4 100644 --- a/packages/efl/evas-x11_0.9.9.037.bb +++ b/packages/efl/evas-x11_0.9.9.037.bb @@ -1,6 +1,6 @@ require evas.inc DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r7" +PR = "r8" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index f065d944f8..ceca03c0a8 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -28,6 +28,10 @@ do_configure_prepend() { fi } +#do_install_append() { +# find "${S}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH" +#} + do_stage_append() { cd src modules=`find modules -name ".libs"` @@ -40,4 +44,6 @@ do_stage_append() { headers = "<override me>" libraries = "libevas" -FILES_${PN} += "/usr/lib/evas/" +FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so" +FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la" +FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
\ No newline at end of file diff --git a/packages/efl/imlib2-fb_1.2.2.001.bb b/packages/efl/imlib2-fb_1.2.2.001.bb index 776acb43f6..f2ee48f5d9 100644 --- a/packages/efl/imlib2-fb_1.2.2.001.bb +++ b/packages/efl/imlib2-fb_1.2.2.001.bb @@ -1,4 +1,5 @@ require imlib2.inc +PR = "r2" EXTRA_OECONF = "--without-x \ --disable-mmx" diff --git a/packages/efl/imlib2-native_1.2.2.001.bb b/packages/efl/imlib2-native_1.2.2.001.bb index da75e8f439..65c5b672b2 100644 --- a/packages/efl/imlib2-native_1.2.2.001.bb +++ b/packages/efl/imlib2-native_1.2.2.001.bb @@ -2,6 +2,7 @@ require imlib2.inc inherit native PROVIDES = "imlib2-native" DEPENDS = "freetype-native libpng-native jpeg-native" +PR = "r2" EXTRA_OECONF = "--disable-mmx \ --without-x" diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb index e7814971c3..67ed947e08 100644 --- a/packages/efl/imlib2-x11_1.2.2.001.bb +++ b/packages/efl/imlib2-x11_1.2.2.001.bb @@ -1,6 +1,6 @@ require imlib2.inc DEPENDS += "virtual/libx11 libxext" -PR = "r1" +PR = "r3" EXTRA_OECONF = "--disable-mmx \ --with-x \ diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc index 4691bf2ce0..6a040c5386 100644 --- a/packages/efl/imlib2.inc +++ b/packages/efl/imlib2.inc @@ -30,8 +30,9 @@ do_stage_append() { } do_install() { + install -d "${D}${includedir}" oe_libinstall -C src/lib libImlib2 ${D}${libdir}/ - install -m 0644 ${S}/src/lib/Imlib2.h ${D}${incdir}/ + install -m 0644 ${S}/src/lib/Imlib2.h ${D}${includedir}/ install -d ${D}${libdir}/imlib2/loaders for i in src/modules/loaders/.libs/*.so @@ -46,9 +47,12 @@ do_install() { done } -PACKAGES =+ "imlib2-loaders imlib2-filters" -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2" -FILES_${PN}-dev += "${bindir}/imlib2-config" +PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" +FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" +FILES_${PN}-dbg = "${libdir}/.debug/" +FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" FILES_imlib2-bin = "${bindir}" FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" +FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" +FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 42e9d151b1..67dbc83940 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r11" +PR = "r12" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb new file mode 100644 index 0000000000..bb1114cf3b --- /dev/null +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -0,0 +1,18 @@ +require gcc_${PV}.bb +# path mangling, needed by the cross packaging +require gcc-paths-cross.inc +inherit cross +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +# NOTE: split PR. If the main .oe changes something that affects its *build* +# remember to increment this one too. +PR = "r0" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" +PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +# cross build +require gcc3-build-cross.inc +# cross packaging +require gcc-package-cross.inc + +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gift/gift_0.11.5.bb b/packages/gift/gift_0.11.5.bb index a2a1e45bab..23ba2378ca 100644 --- a/packages/gift/gift_0.11.5.bb +++ b/packages/gift/gift_0.11.5.bb @@ -1,13 +1,10 @@ SECTION = "console/network" LICENSE = "GPL" -DEPENDS = "libvorbis libogg" +DEPENDS = "libvorbis libogg libtool" DESCRIPTION = "giFT is a framework for bridging multiple \ backend peer-to-peer protocols and the user interface \ associated with them." PR="r1" - -DEPENDS=libtool - FILES_gift_append = " ${datadir}/giFT" SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2" diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb new file mode 100644 index 0000000000..39f7679cc0 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.2.5.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Configuration applets for GPE" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr" +RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr" +RDEPENDS_gpe-conf-panel = "gpe-conf" + +RPROVIDES_${PN} += " bl" +RCONFLICTS_${PN} = "bl" + +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +PACKAGES += "gpe-conf-panel" + +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" diff --git a/packages/gpe-login/files/busybox-bad-perms.patch b/packages/gpe-login/files/busybox-bad-perms.patch deleted file mode 100644 index a422089167..0000000000 --- a/packages/gpe-login/files/busybox-bad-perms.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- gpe-login.pre-session.orig 2005-09-08 00:18:21.000000000 +0200 -+++ gpe-login-0.82/X11/gpe-login.pre-session 2005-09-08 00:18:13.000000000 +0200 -@@ -4,26 +4,28 @@ - - # Sound devices on various devices # - -+if [ -e /dev/dsp ]; then -+chown $USER /dev/dsp -+fi -+ -+if [ -e /dev/mixer ]; then -+chown $USER /dev/mixer -+fi -+ - if [ -e /dev/sound/dsp ]; then - chown $USER /dev/sound/dsp -+chmod u+rw /dev/sound/dsp - fi - - if [ -e /dev/sound/mixer ]; then - chown $USER /dev/sound/mixer -+chmod u+rw /dev/sound/mixer - fi - - if [ -e /dev/misc/buzzer ]; then - chown $USER /dev/misc/buzzer - fi - --if [ -e /dev/dsp ]; then --chown $USER /dev/dsp --fi -- --if [ -e /dev/mixer ]; then --chown $USER /dev/mixer --fi -- - # touchscreen devices # - - if [ -e /dev/touchscreen/0raw ]; then diff --git a/packages/gpe-login/files/highdpifontfix.patch b/packages/gpe-login/files/highdpifontfix.patch deleted file mode 100644 index cc5a42dcfc..0000000000 --- a/packages/gpe-login/files/highdpifontfix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /tmp/gpe-login.gtkrc 2005-11-08 17:15:50.363302568 +0100 -+++ gpe-login-0.83/X11/gpe-login.gtkrc 2005-11-08 17:16:22.659392816 +0100 -@@ -1,9 +1,2 @@ --gtk-font-name = "Sans 8" --include "/usr/share/themes/Angelistic/gtk-2.0/gtkrc" -- --style "default" --{ -- bg[NORMAL] = "#90d8ff" --} -- --widget "*" style "default" -+gtk-font-name = "Sans 5" -+include "/usr/share/themes/Industrial/gtk-2.0/gtkrc" diff --git a/packages/gpe-login/files/pre-session.patch b/packages/gpe-login/files/pre-session.patch deleted file mode 100644 index ac1629f08a..0000000000 --- a/packages/gpe-login/files/pre-session.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- /tmp/gpe-login.pre-session 2005-02-17 10:49:01.726436296 +0100 -+++ gpe-login-0.75/X11/gpe-login.pre-session 2005-02-17 10:48:42.297389960 +0100 -@@ -4,10 +4,22 @@ - - if [ -e /dev/sound/dsp ]; then - chown $USER /dev/sound/dsp -+chmod u+rw /dev/sound/dsp -+fi -+ -+if [ -e /dev/dsp ]; then -+chown $USER /dev/dsp -+chmod u+rw /dev/dsp - fi - - if [ -e /dev/sound/mixer ]; then - chown $USER /dev/sound/mixer -+chmod u+rw /dev/sound/mixer -+fi -+ -+if [ -e /dev/mixer ]; then -+chown $USER /dev/mixer -+chmod u+rw /dev/mixer - fi - - if [ -e /dev/touchscreen/0raw ]; then -@@ -18,13 +30,26 @@ - chown $USER /dev/touchscreen/0 - fi - -+if [ -e /dev/collie-fl ]; then -+chown $USER /dev/sharp_fl -+fi -+ - if [ -e /dev/misc/buzzer ]; then - chown $USER /dev/misc/buzzer - fi - --mkdir -p /mnt/ramfs/home/$USER --chown $USER /mnt/ramfs/home/$USER -+# check for ramdisk location -+if [ -d /mnt/ramfs ]; then -+# old location as used in familiar <= 0.7.2 -+RAMDISK="/mnt/ramfs" -+else -+# default to new style location -+RAMDISK="/mnt/ram" -+fi -+ -+mkdir -p $RAMDISK/home/$USER -+chown $USER $RAMDISK/home/$USER - - # this location MUST be consistent with HOME_VOLATILE in /etc/X11/Xsession --ln -s /mnt/ramfs/home/$USER /home/$USER/ramdisk --ln -s /home/$USER/ramdisk/.xsession-errors /home/$USER/.xsession-errors -+ln -sf $RAMDISK/home/$USER /home/$USER/ramdisk -+ln -sf /home/$USER/ramdisk/.xsession-errors /home/$USER/.xsession-errors diff --git a/packages/gpe-login/files/user-own-collie-devs.patch b/packages/gpe-login/files/user-own-collie-devs.patch deleted file mode 100644 index 3a0ce9b7b8..0000000000 --- a/packages/gpe-login/files/user-own-collie-devs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urNd ../gpe-login-0.76-r0/gpe-login-0.76/X11/gpe-login.pre-session gpe-login-0.76/X11/gpe-login.pre-session ---- ../gpe-login-0.76-r0/gpe-login-0.76/X11/gpe-login.pre-session 2005-04-01 21:58:46 +01:00 -+++ gpe-login-0.76/X11/gpe-login.pre-session 2005-04-01 22:04:04 +01:00 -@@ -30,13 +30,23 @@ - chown $USER /dev/touchscreen/0 - fi - --if [ -e /dev/collie-fl ]; then -+if [ -e /dev/misc/buzzer ]; then -+chown $USER /dev/misc/buzzer -+fi -+ -+# The following added for collie -+if [ -e /dev/sharp_fl ]; then - chown $USER /dev/sharp_fl - fi - --if [ -e /dev/misc/buzzer ]; then --chown $USER /dev/misc/buzzer -+if [ -e /dev/fb0 ]; then -+chown $USER /dev/fb0 -+fi -+ -+if [ -e /dev/tty ]; then -+chown $USER /dev/tty* - fi -+# collie bits finished - - # check for ramdisk location - if [ -d /mnt/ramfs ]; then diff --git a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty b/packages/gpe-login/gpe-login-0.88/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-login/gpe-login-0.88/.mtn2git_empty diff --git a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch new file mode 100644 index 0000000000..798c059ccc --- /dev/null +++ b/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch @@ -0,0 +1,12 @@ +--- /tmp/gpe-login.keylaunchrc 2006-05-29 23:46:42.806081576 +0200 ++++ gpe-login-0.87/gpe-login.keylaunchrc 2006-05-29 23:48:18.476537456 +0200 +@@ -1,3 +1,9 @@ + key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh + key=????XF86PowerDown:-:/usr/bin/apm --suspend + key=????Held XF86PowerDown:-:bl toggle ++ ++# VT changing ++key=...*Left:-:~chvt 1 ++key=...*Right:-:~chvt 3 ++key=...*Escape:-:~/etc/init.d/gpe-dm stop ++ diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb new file mode 100644 index 0000000000..ea1723d52d --- /dev/null +++ b/packages/gpe-login/gpe-login_0.88.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" + +SRC_URI += "file://removeblue-fontsize8.patch;patch=1" +SRC_URI += " file://chvt-keylaunch.patch;patch=1 " diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd index c835e64063..822abf57ca 100644 --- a/packages/gsm/files/fic-gta01/gsmd +++ b/packages/gsm/files/fic-gta01/gsmd @@ -48,10 +48,10 @@ start() { if [ -e "${GSM_DEV}" ] then chown uucp.uucp ${GSM_DEV} - mkdir -fp /usr/spool/uucp + mkdir -p /usr/spool/uucp chown uucp.uucp /usr/spool/uucp stty -F /dev/ttySAC0 crtscts - gsmd -p ${GSM_DEV} ${GSMD_OPTS} + gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & echo "success" else # User needs to symlink ${GPS_DEV} to the right thing diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 9a820f6f56..79623f1897 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.0+svn${SRCDATE}" -PR = "r5" +PR = "r6" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd" diff --git a/packages/gtk+/gtk+-directfb_2.10.9.bb b/packages/gtk+/gtk+-directfb_2.10.9.bb new file mode 100644 index 0000000000..f8062f33f7 --- /dev/null +++ b/packages/gtk+/gtk+-directfb_2.10.9.bb @@ -0,0 +1,38 @@ +require gtk-2.10.inc + +PR = "r0" + +# disable per default - untested and not all patches included. +DEFAULT_PREFERENCE = "-1" +S = "${WORKDIR}/gtk+-${PV}" + +LDFLAGS_append += " -ldirectfb" +CFLAGS_append += " -I${STAGING_INCDIR}/directfb" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ + file://no-xwc.patch;patch=1 \ + file://automake-lossage.patch;patch=1 \ + file://disable-tooltips.patch;patch=1 \ + file://gtklabel-resize-patch;patch=1 \ + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ + file://run-iconcache.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1 \ + file://single-click.patch;patch=1 \ + file://spinbutton.patch;patch=1 \ + file://gtk+-handhelds.patch;patch=1 \ + file://directfb_pixbuf_deprecated_fix.patch;patch=1 \ +# file://gtk-doc.patch;patch=1 \ +" +EXTRA_OECONF =" \ + --prefix=${STAGING_DIR} \ + --with-gdktarget=directfb \ + --without-x \ + --without-libtiff \ + " +GDKTARGET="directfb" + diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc index 0a5860f01a..6f9035055b 100644 --- a/packages/gtk+/gtk-2.10.inc +++ b/packages/gtk+/gtk-2.10.inc @@ -33,11 +33,13 @@ RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" +export GDKTARGET="x11" + LIBV = "2.10.0" do_stage () { - oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gtk libgtk-$GDKTARGET-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk libgdk-$GDKTARGET-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} diff --git a/packages/initscripts/initscripts-1.0/oplinux-uclibc/.mtn2git_empty b/packages/initscripts/initscripts-1.0/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux-uclibc/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh b/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh new file mode 100755 index 0000000000..e5fc6ed8b5 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux-uclibc/checkroot.sh @@ -0,0 +1,201 @@ +# +# checkroot.sh Check to root filesystem. +# +# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl +# + +. /etc/default/rcS + +# +# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned +# from this script *before anything else* with a timeout, like SCO does. +# +test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE + +# +# Ensure that bdflush (update) is running before any major I/O is +# performed (the following fsck is a good example of such activity :). +# +test -x /sbin/update && update + +# +# Read /etc/fstab. +# +exec 9>&0 </etc/fstab +rootmode=rw +rootopts=rw +test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no" +swap_on_md=no +devfs= +while read fs mnt type opts dump pass junk +do + case "$fs" in + ""|\#*) + continue; + ;; + /dev/md*) + # Swap on md device. + test "$type" = swap && swap_on_md=yes + ;; + /dev/*) + ;; + *) + # Might be a swapfile. + test "$type" = swap && swap_on_md=yes + ;; + esac + + test "$type" = devfs && devfs="$fs" + + # Currently we do not care about the other entries + if test "$mnt" = "/" + then + #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]" + + rootopts="$opts" + roottype="$type" + + #The "spinner" is broken on busybox sh + TERM=dumb + + test "$pass" = 0 -o "$pass" = "" && rootcheck=no + + # Enable fsck for ext2 and ext3 rootfs, disable for everything else + case "$type" in + ext2|ext3) rootcheck=yes;; + *) rootcheck=no;; + esac + + if test "$rootcheck" = yes + then + if ! test -x "/sbin/fsck.${roottype}" + then + echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n" + rootcheck=no + fi + fi + + case "$opts" in + ro|ro,*|*,ro|*,ro,*) + rootmode=ro + ;; + esac + fi +done +exec 0>&9 9>&- + +# +# Activate the swap device(s) in /etc/fstab. This needs to be done +# before fsck, since fsck can be quite memory-hungry. +# +doswap=no +test -d /proc/1 || mount -n /proc +case "`uname -r`" in + 2.[0123].*) + if test $swap_on_md = yes && grep -qs resync /proc/mdstat + then + test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing" + else + doswap=yes + fi + ;; + *) + doswap=yes + ;; +esac +if test $doswap = yes +then + test "$VERBOSE" != no && echo "Activating swap" + swapon -a 2> /dev/null +fi + +# +# Check the root filesystem. +# +if test -f /fastboot || test $rootcheck = no +then + test $rootcheck = yes && echo "Fast boot, no filesystem check" +else + # + # Ensure that root is quiescent and read-only before fsck'ing. + # + mount -n -o remount,ro / + if test $? = 0 + then + if test -f /forcefsck + then + force="-f" + else + force="" + fi + if test "$FSCKFIX" = yes + then + fix="-y" + else + fix="-a" + fi + spinner="-C" + case "$TERM" in + dumb|network|unknown|"") spinner="" ;; + esac + test `uname -m` = s390 && spinner="" # This should go away + test "$VERBOSE" != no && echo "Checking root filesystem..." + fsck $spinner $force $fix / + # + # If there was a failure, drop into single-user mode. + # + # NOTE: "failure" is defined as exiting with a return code of + # 2 or larger. A return code of 1 indicates that filesystem + # errors were corrected but that the boot may proceed. + # + if test "$?" -gt 1 + then + # Surprise! Re-directing from a HERE document (as in + # "cat << EOF") won't work, because the root is read-only. + echo + echo "fsck failed. Please repair manually and reboot. Please note" + echo "that the root filesystem is currently mounted read-only. To" + echo "remount it read-write:" + echo + echo " # mount -n -o remount,rw /" + echo + echo "CONTROL-D will exit from this shell and REBOOT the system." + echo + # Start a single user shell on the console + /sbin/sulogin $CONSOLE + reboot -f + fi + else + echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" + echo + fi +fi + +# +# If the root filesystem was not marked as read-only in /etc/fstab, +# remount the rootfs rw but do not try to change mtab because it +# is on a ro fs until the remount succeeded. Then clean up old mtabs +# and finally write the new mtab. +# This part is only needed if the rootfs was mounted ro. +# + +if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then + exit 0 +fi + + +echo "Remounting root file system..." +mount -n -o remount,$rootmode / +if test "$rootmode" = rw +then + if test ! -L /etc/mtab + then + rm -f /etc/mtab~ /etc/nologin + : > /etc/mtab + fi + mount -f -o remount / + mount -f /proc + test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" +fi + +: exit 0 diff --git a/packages/initscripts/initscripts-1.0/oplinux/.mtn2git_empty b/packages/initscripts/initscripts-1.0/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh b/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh new file mode 100755 index 0000000000..e5fc6ed8b5 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/oplinux/checkroot.sh @@ -0,0 +1,201 @@ +# +# checkroot.sh Check to root filesystem. +# +# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl +# + +. /etc/default/rcS + +# +# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned +# from this script *before anything else* with a timeout, like SCO does. +# +test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE + +# +# Ensure that bdflush (update) is running before any major I/O is +# performed (the following fsck is a good example of such activity :). +# +test -x /sbin/update && update + +# +# Read /etc/fstab. +# +exec 9>&0 </etc/fstab +rootmode=rw +rootopts=rw +test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no" +swap_on_md=no +devfs= +while read fs mnt type opts dump pass junk +do + case "$fs" in + ""|\#*) + continue; + ;; + /dev/md*) + # Swap on md device. + test "$type" = swap && swap_on_md=yes + ;; + /dev/*) + ;; + *) + # Might be a swapfile. + test "$type" = swap && swap_on_md=yes + ;; + esac + + test "$type" = devfs && devfs="$fs" + + # Currently we do not care about the other entries + if test "$mnt" = "/" + then + #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]" + + rootopts="$opts" + roottype="$type" + + #The "spinner" is broken on busybox sh + TERM=dumb + + test "$pass" = 0 -o "$pass" = "" && rootcheck=no + + # Enable fsck for ext2 and ext3 rootfs, disable for everything else + case "$type" in + ext2|ext3) rootcheck=yes;; + *) rootcheck=no;; + esac + + if test "$rootcheck" = yes + then + if ! test -x "/sbin/fsck.${roottype}" + then + echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n" + rootcheck=no + fi + fi + + case "$opts" in + ro|ro,*|*,ro|*,ro,*) + rootmode=ro + ;; + esac + fi +done +exec 0>&9 9>&- + +# +# Activate the swap device(s) in /etc/fstab. This needs to be done +# before fsck, since fsck can be quite memory-hungry. +# +doswap=no +test -d /proc/1 || mount -n /proc +case "`uname -r`" in + 2.[0123].*) + if test $swap_on_md = yes && grep -qs resync /proc/mdstat + then + test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing" + else + doswap=yes + fi + ;; + *) + doswap=yes + ;; +esac +if test $doswap = yes +then + test "$VERBOSE" != no && echo "Activating swap" + swapon -a 2> /dev/null +fi + +# +# Check the root filesystem. +# +if test -f /fastboot || test $rootcheck = no +then + test $rootcheck = yes && echo "Fast boot, no filesystem check" +else + # + # Ensure that root is quiescent and read-only before fsck'ing. + # + mount -n -o remount,ro / + if test $? = 0 + then + if test -f /forcefsck + then + force="-f" + else + force="" + fi + if test "$FSCKFIX" = yes + then + fix="-y" + else + fix="-a" + fi + spinner="-C" + case "$TERM" in + dumb|network|unknown|"") spinner="" ;; + esac + test `uname -m` = s390 && spinner="" # This should go away + test "$VERBOSE" != no && echo "Checking root filesystem..." + fsck $spinner $force $fix / + # + # If there was a failure, drop into single-user mode. + # + # NOTE: "failure" is defined as exiting with a return code of + # 2 or larger. A return code of 1 indicates that filesystem + # errors were corrected but that the boot may proceed. + # + if test "$?" -gt 1 + then + # Surprise! Re-directing from a HERE document (as in + # "cat << EOF") won't work, because the root is read-only. + echo + echo "fsck failed. Please repair manually and reboot. Please note" + echo "that the root filesystem is currently mounted read-only. To" + echo "remount it read-write:" + echo + echo " # mount -n -o remount,rw /" + echo + echo "CONTROL-D will exit from this shell and REBOOT the system." + echo + # Start a single user shell on the console + /sbin/sulogin $CONSOLE + reboot -f + fi + else + echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" + echo + fi +fi + +# +# If the root filesystem was not marked as read-only in /etc/fstab, +# remount the rootfs rw but do not try to change mtab because it +# is on a ro fs until the remount succeeded. Then clean up old mtabs +# and finally write the new mtab. +# This part is only needed if the rootfs was mounted ro. +# + +if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then + exit 0 +fi + + +echo "Remounting root file system..." +mount -n -o remount,$rootmode / +if test "$rootmode" = rw +then + if test ! -L /etc/mtab + then + rm -f /etc/mtab~ /etc/nologin + : > /etc/mtab + fi + mount -f -o remount / + mount -f /proc + test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" +fi + +: exit 0 diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 06a6017e15..33cbf9ca03 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -5,7 +5,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r86" +PR = "r87" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/linux/linux-efika-2.6.20/0033-EFIKA-fullduplex-prpl_aln.txt b/packages/linux/linux-efika-2.6.20/0033-EFIKA-fullduplex-prpl_aln.txt new file mode 100644 index 0000000000..6feba7b112 --- /dev/null +++ b/packages/linux/linux-efika-2.6.20/0033-EFIKA-fullduplex-prpl_aln.txt @@ -0,0 +1,27 @@ +diff -uNr orig-drivers/net/fec_mpc52xx/fec.c drivers/net/fec_mpc52xx/fec.c +--- /orig-drivers/net/fec_mpc52xx/fec.c 2007-03-10 13:34:46.000000000 +0200 ++++ /drivers/net/fec_mpc52xx/fec.c 2007-03-10 13:45:45.000000000 +0200 +@@ -525,7 +525,7 @@ + priv->phy_speed = ((bd->bi_ipbfreq >> 20) / 5) << 1; + #endif + +- fec_restart(dev, 0); /* always use half duplex mode only */ ++ fec_restart(dev, 1); /* always use full duplex mode only */ + /* + * Read MIB counters in order to reset them, + * then zero all the stats fields in memory +diff -uNr orig-drivers/net/fec_mpc52xx/fec_phy.c drivers/net/fec_mpc52xx/fec_phy.c +--- /orig-drivers/net/fec_mpc52xx/fec_phy.c 2007-03-10 13:34:47.000000000 +0200 ++++ /drivers/net/fec_mpc52xx/fec_phy.c 2007-03-10 13:44:56.000000000 +0200 +@@ -227,8 +227,8 @@ + "GENERIC", + + (const phy_cmd_t []) { /* config */ +- /* advertise only half-duplex capabilities */ +- { mk_mii_write(MII_ADVERTISE, MII_ADVERTISE_HALF), ++ /* advertise only full-duplex capabilities */ ++ { mk_mii_write(MII_ADVERTISE, MII_ADVERTISE_ALL), + mii_parse_anar }, + + /* enable auto-negotiation */ + diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb index 2081693d68..88726073c2 100644 --- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb +++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb @@ -28,7 +28,7 @@ RPROVIDES_kernel-image += "hostap-modules" do_configure_prepend() { install -m 0644 ${WORKDIR}/imx31ads_defconfig ${S}/defconfig - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/packages/ltrace/files/.mtn2git_empty b/packages/ltrace/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ltrace/files/.mtn2git_empty diff --git a/packages/ltrace/files/no-usr-include.patch b/packages/ltrace/files/no-usr-include.patch new file mode 100644 index 0000000000..adadfa8032 --- /dev/null +++ b/packages/ltrace/files/no-usr-include.patch @@ -0,0 +1,16 @@ +--- ltrace-0.4.orig/configure.ac ++++ ltrace-0.4/configure.ac +@@ -41,13 +41,6 @@ + dnl AC_CHECK_FUNCS(gettimeofday strdup strerror strspn) + AC_CHECK_FUNCS(getopt getopt_long) + +-for path in /usr/include/elfutils /usr/local/include/elfutils \ +- /usr/include/libelf /usr/local/include/libelf; do +- if test -f ${path}/gelf.h; then +- CPPFLAGS="$CPPFLAGS -I ${path}" +- fi +-done +- + AC_CHECK_HEADER(gelf.h,,AC_MSG_ERROR([***** gelf.h not found *****])) + + AC_CHECK_LIB(elf,gelf_getdyn) diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb index 4ef906f2f9..97b7d18d22 100644 --- a/packages/ltrace/ltrace_0.4.bb +++ b/packages/ltrace/ltrace_0.4.bb @@ -6,7 +6,8 @@ LICENSE = "GPL" PR = "r0" SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz \ - ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1" + ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ + file://no-usr-include.patch;patch=1" inherit autotools PARALLEL_MAKE = "" diff --git a/packages/netbase/netbase/oplinux-uclibc/.mtn2git_empty b/packages/netbase/netbase/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/oplinux-uclibc/.mtn2git_empty diff --git a/packages/netbase/netbase/oplinux-uclibc/interfaces b/packages/netbase/netbase/oplinux-uclibc/interfaces new file mode 100644 index 0000000000..673618f636 --- /dev/null +++ b/packages/netbase/netbase/oplinux-uclibc/interfaces @@ -0,0 +1,10 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Ethernet +auto eth0 +iface eth0 inet dhcp + diff --git a/packages/netbase/netbase/oplinux-uclibc/options b/packages/netbase/netbase/oplinux-uclibc/options new file mode 100644 index 0000000000..14380f4376 --- /dev/null +++ b/packages/netbase/netbase/oplinux-uclibc/options @@ -0,0 +1,3 @@ +ip_forward=yes +spoofprotect=yes +syncookies=no diff --git a/packages/netbase/netbase/oplinux/.mtn2git_empty b/packages/netbase/netbase/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/oplinux/.mtn2git_empty diff --git a/packages/netbase/netbase/oplinux/interfaces b/packages/netbase/netbase/oplinux/interfaces new file mode 100644 index 0000000000..673618f636 --- /dev/null +++ b/packages/netbase/netbase/oplinux/interfaces @@ -0,0 +1,10 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Ethernet +auto eth0 +iface eth0 inet dhcp + diff --git a/packages/netbase/netbase/oplinux/options b/packages/netbase/netbase/oplinux/options new file mode 100644 index 0000000000..14380f4376 --- /dev/null +++ b/packages/netbase/netbase/oplinux/options @@ -0,0 +1,3 @@ +ip_forward=yes +spoofprotect=yes +syncookies=no diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index f97d8986aa..53c9f3d17c 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r15" +PR = "r16" inherit update-rc.d diff --git a/packages/php/php-5.2.0/.mtn2git_empty b/packages/php/php-5.2.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/php/php-5.2.0/.mtn2git_empty diff --git a/packages/php/php-5.2.0/acinclude-xml2-config.patch b/packages/php/php-5.2.0/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/packages/php/php-5.2.0/acinclude-xml2-config.patch @@ -0,0 +1,18 @@ +--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 ++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 +@@ -2359,12 +2359,9 @@ + AC_DEFUN([PHP_SETUP_LIBXML], [ + AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, + [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done ++ ++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" ++ + ]) + + if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/packages/php/php-5.2.0/autotools.patch b/packages/php/php-5.2.0/autotools.patch new file mode 100644 index 0000000000..9f1289fd11 --- /dev/null +++ b/packages/php/php-5.2.0/autotools.patch @@ -0,0 +1,95 @@ +diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4 +--- php-5.1.4~/acinclude.m4 2006-04-10 08:17:36.000000000 -0400 ++++ php-5.1.4/acinclude.m4 2006-08-16 22:32:58.000000000 -0400 +@@ -818,10 +818,10 @@ + OVERALL_TARGET=[]ifelse($1,,php,$1) + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' +- php_c_post= ++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' +- php_cxx_post= ++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_lo=lo + + case $with_pic in +@@ -1670,6 +1670,7 @@ + have_fopen_cookie=yes + + dnl even newer glibcs have a different seeker definition... ++AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, + AC_TRY_RUN([ + #define _GNU_SOURCE + #include <stdio.h> +@@ -1702,10 +1703,11 @@ + cookie_io_functions_use_off64_t=yes + ], [ + cookie_io_functions_use_off64_t=no +-], [ +- cookie_io_functions_use_off64_t=no +-]) +- ++], ++[ php_cv_lib_cookie_io_functions_use_off64_t=yes ], ++[ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) ++ ++ + else + + dnl older glibc versions (up to 2.1.2 ?) +diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in +--- php-5.1.4~/configure.in 2006-05-03 19:30:02.000000000 -0400 ++++ php-5.1.4/configure.in 2006-08-16 20:39:19.000000000 -0400 +@@ -209,6 +209,7 @@ + + sinclude(Zend/Zend.m4) + sinclude(TSRM/tsrm.m4) ++sinclude(TSRM/threads.m4) + + + divert(2) +@@ -255,11 +255,6 @@ + PTHREADS_FLAGS + fi + +-if test "$PHP_ENABLE_FASTCGI" = "yes"; then +- PHP_CONFIGURE_PART(Running FastCGI checks) +- sinclude(sapi/cgi/libfcgi/acinclude.m4) +- sinclude(sapi/cgi/libfcgi/libfcgi.m4) +-fi + + divert(3) + +diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4 +--- php-5.1.4~/scripts/phpize.m4 2006-04-10 08:16:17.000000000 -0400 ++++ php-5.1.4/scripts/phpize.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -3,7 +3,6 @@ + divert(1) + + AC_PREREQ(2.13) +-AC_INIT(config.m4) + + PHP_CONFIG_NICE(config.nice) + +@@ -69,8 +68,6 @@ + PHP_PROG_RE2C + PHP_PROG_AWK + +-sinclude(config.m4) +- + enable_static=no + enable_shared=yes + +diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4 +--- php-5.1.4~/TSRM/threads.m4 2005-04-27 09:22:18.000000000 -0400 ++++ php-5.1.4/TSRM/threads.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -86,7 +86,7 @@ + pthreads_working=no + ], [ + dnl For cross compiling running this test is of no use. NetWare supports pthreads +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes diff --git a/packages/php/php-5.2.0/pear-makefile.patch b/packages/php/php-5.2.0/pear-makefile.patch new file mode 100644 index 0000000000..26de98a48f --- /dev/null +++ b/packages/php/php-5.2.0/pear-makefile.patch @@ -0,0 +1,11 @@ +--- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 ++++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 +@@ -6,7 +6,7 @@ + PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb index 3b24fbec40..a4674f08ef 100644 --- a/packages/php/php_5.2.0.bb +++ b/packages/php/php_5.2.0.bb @@ -1,12 +1,15 @@ SECTION = "console/network" DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql libiconv" +DEPENDS = "zlib libxml2 mysql libiconv php-native" + SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ + file://autotools.patch;patch=1 \ + file://acinclude-xml2-config.patch;patch=1 \ + file://pear-makefile.patch;patch=1 \ " - S = "${WORKDIR}/php-${PV}" -PR = "r0" +PR = "r1" inherit autotools @@ -14,28 +17,29 @@ export THREADS="pthread" export LIBS=" -lpthread " CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" - EXTRA_OECONF = " --without-iconv \ --enable-discard-path \ --enable-sockets \ --enable-memory-limit \ --enable-wddx \ - --with-zlib" + --enable-embedded-mysqli \ + --enable-magic-quotes \ + --with-zlib \ + --with-mysql="${STAGING_DIR}/${TARGET_SYS}" \ + --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ +" -EXTRA_OECONF += " --without-pear --with-libxml-dir=${STAGING_BINDIR} " -export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" -# Uncomment the following two lines, and comment the above to enable PEAR -#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php" -#DEPENDS += " php-native" -acpaths = "" -do_configure () { - autoreconf -ac_cv_php_xml2_config_path=${STAGING_BINDIR_CROSS}/xml2-config oe_runconf -} +# Uncomment the following two lines, and comment the above to enable PEAR +EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR}" + +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" +export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}" +export PHP_PEAR_PHP_BIN="/usr/bin/php" +acpaths = "" do_configure_append() { find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' @@ -45,3 +49,44 @@ do_install () { oe_runmake 'INSTALL_ROOT=${D}' install } + + +PACKAGES = "${PN}-dbg \ + ${PN}-cli \ + ${PN}-pear \ + ${PN}-dev \ + ${PN} \ +" + + +FILES_${PN}-dbg ="/usr/bin/.debug" + +FILES_${PN}-cli ="/usr/bin/php" + +FILES_${PN}-pear ="/usr/bin/pear* /usr/bin/pecl \ + /usr/lib/php/PEAR \ + /usr/lib/php/PEAR.php \ + /usr/lib/php/System.php /usr/lib/php/peclcmd.php /usr/lib/php/pearcmd.php \ + /usr/lib/php/.channels /usr/lib/php/.channels/.alias \ + /usr/lib/php/.channels\__uri.reg \ + /usr/lib/php/.channels\pear.php.net.reg /usr/lib/php/.channels/pecl.php.net.reg \ + /usr/lib/php/.registry \ + /usr/lib/php/Archive/Tar.php \ + /usr/lib/php/Console/Getopt.php /usr/lib/php/OS/Guess.php \ + /usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \ + /usr/lib/php/.lock" + + +FILES_${PN}-dev ="/usr/include/php /usr/include/build \ + /usr/bin/phpize /usr/bin/php-config" + +FILES_${PN} ="/usr/lib/php" +FILES_${PN} +="/usr/bin" + + + +RDEPENDS_${PN}-pear =${PN} +RDEPENDS_${PN}-cli =${PN} +RDEPENDS_${PN}-dev =${PN} + + diff --git a/packages/python/python-pygtk2_2.6.3.bb b/packages/python/python-pygtk2_2.6.3.bb new file mode 100644 index 0000000000..61250631ef --- /dev/null +++ b/packages/python/python-pygtk2_2.6.3.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Python GTK+ Bindings" +SECTION = "devel/python" +# needs gtk+-2.6.x +DEPENDS = "gtk+ libglade" +RDEPENDS = "python-shell" +SRCNAME = "pygtk" +LICENSE = "LGPL" +PR = "ml0" + +SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/${SRCNAME}-${PV}.tar.bz2 \ + file://acinclude.m4" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools pkgconfig distutils-base + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc ${PN}" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gtk/.debug \ + ${libdir}/python2.4/site-packages/gtk-2.0/.debug" +FILES_${PN}-dev += "${bindir} ${datadir}/pygtk ${libdir}/pygtk" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_stage() { + autotools_stage_includes + sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 + install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/ + install -d ${STAGING_DATADIR}/pygtk/2.0/codegen + install -d ${STAGING_DATADIR}/pygtk/2.0/defs/ + cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/ + cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ + cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/ +} diff --git a/packages/sysvinit/sysvinit/oplinux-uclibc/.mtn2git_empty b/packages/sysvinit/sysvinit/oplinux-uclibc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux-uclibc/.mtn2git_empty diff --git a/packages/sysvinit/sysvinit/oplinux-uclibc/inittab b/packages/sysvinit/sysvinit/oplinux-uclibc/inittab new file mode 100644 index 0000000000..1bb7c45254 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux-uclibc/inittab @@ -0,0 +1,39 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + + +1:2345:respawn:/sbin/getty 115200 tty1 +2:23:respawn:/sbin/getty 115200 tty2 +3:23:respawn:/sbin/getty 115200 tty3 +4:23:respawn:/sbin/getty 115200 tty4 +5:23:respawn:/sbin/getty 115200 tty5 +6:23:respawn:/sbin/getty 115200 tty6 + diff --git a/packages/sysvinit/sysvinit/oplinux/.mtn2git_empty b/packages/sysvinit/sysvinit/oplinux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux/.mtn2git_empty diff --git a/packages/sysvinit/sysvinit/oplinux/inittab b/packages/sysvinit/sysvinit/oplinux/inittab new file mode 100644 index 0000000000..1bb7c45254 --- /dev/null +++ b/packages/sysvinit/sysvinit/oplinux/inittab @@ -0,0 +1,39 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + + +1:2345:respawn:/sbin/getty 115200 tty1 +2:23:respawn:/sbin/getty 115200 tty2 +3:23:respawn:/sbin/getty 115200 tty3 +4:23:respawn:/sbin/getty 115200 tty4 +5:23:respawn:/sbin/getty 115200 tty5 +6:23:respawn:/sbin/getty 115200 tty6 + diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 1a2d79c9be..a4c4ff8381 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPL" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r32" +PR = "r33" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. |