diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2006-02-05 01:01:54 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-05 01:01:54 +0000 |
| commit | a1e5ad6c67eaaf22b6223f3f3c2633177d77f4da (patch) | |
| tree | edf3a86d536491c46247a95e76c1910de359e9ae | |
| parent | 0c89a054a6e3279f935d0fd1b1a29d5da3b2089d (diff) | |
| parent | f5c58cb11d713fe6fabccc5265ba461600b0971c (diff) | |
merge of 253b3416d6485c95aa1653ae4d5b49a707d9fbe6
and 9b98e6390444bf96f5e5fa74d89ff83c0083a833
82 files changed, 1598 insertions, 35550 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index f7d941063d..1d40bbac56 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -68,10 +68,5 @@ include conf/distro/preferred-gpe-versions-2.8.inc # # E # - - -#23:57 < mickeyl> it's no longer necessary since our cleanup -#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it - -#include conf/distro/preferred-e-versions.inc +include conf/distro/preferred-e-versions.inc diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 072c69c5a0..f424b16696 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -63,5 +63,5 @@ include conf/distro/preferred-gpe-versions-2.8.inc # # E # -#include conf/distro/preferred-e-versions.inc +include conf/distro/preferred-e-versions.inc diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index d861944d53..e4571f1ae6 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -2,12 +2,26 @@ # Specify which versions of E-related libraries and applications to build # -PREFERRED_VERSION_ecore = "0.9.9.013" -PREFERRED_VERSION_edb = "1.0.5.004" -PREFERRED_VERSION_edje = "0.5.0.013" -PREFERRED_VERSION_eet = "0.9.10.013" -PREFERRED_VERSION_embryo = "0.9.1.013" -PREFERRED_VERSION_etox = "0.9.0.004" -PREFERRED_VERSION_evas = "0.9.9.013" -PREFERRED_VERSION_ewl = "0.0.4.004" -PREFERRED_VERSION_imlib2 = "1.2.1.004" +PREFERRED_VERSION_e = "0.16.999.023" +PREFERRED_VERSION_ecore-x11 = "0.9.9.023" +PREFERRED_VERSION_ecore-native = "0.9.9.023" +PREFERRED_VERSION_edb = "1.0.5.005" +PREFERRED_VERSION_edb-native = "1.0.5.005" +PREFERRED_VERSION_edje = "0.5.0.023" +PREFERRED_VERSION_edje-native = "0.5.0.023" +PREFERRED_VERSION_eet = "0.9.10.023" +PREFERRED_VERSION_eet-native = "0.9.10.023" +PREFERRED_VERSION_embryo = "0.9.1.023" +PREFERRED_VERSION_embryo-native = "0.9.1.023" +PREFERRED_VERSION_emotion = "0.0.1.004" +PREFERRED_VERSION_emotion-native = "0.0.1.004" +PREFERRED_VERSION_epeg = "0.9.0.005" +PREFERRED_VERSION_epsilon = "0.3.0.005" +PREFERRED_VERSION_esmart-x11 = "0.9.0.005" +PREFERRED_VERSION_evas-x11 = "0.9.9.023" +PREFERRED_VERSION_evas-native = "0.9.9.023" +PREFERRED_VERSION_ewl = "0.0.4.005" +PREFERRED_VERSION_imlib2-x11 = "1.2.1.010" +PREFERRED_VERSION_imlib2-native = "1.2.1.010" +PREFERRED_VERSION_e-wm = "0.16.999.023" +PREFERRED_VERSION_entrance = "0.9.0.005" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index d8a82ea9f7..d3882b7f65 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -2,6 +2,7 @@ # Don't forget to include zaurus-clamshell.conf as well PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_VERSION_wpa_supplicant = "0.4.7" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index 886b065b52..fb37e07aec 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/packages/base-files/base-files/tosa/fstab @@ -9,4 +9,4 @@ tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,auto 0 0 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 1f06cc1036..0689cfa0f3 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 = "r46" +PR = "r47" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/dbus/dbus/no-static.patch b/packages/dbus/dbus/no-static.patch new file mode 100644 index 0000000000..a28a582681 --- /dev/null +++ b/packages/dbus/dbus/no-static.patch @@ -0,0 +1,22 @@ +--- dbus-0.23.4/bus/Makefile.am.old 2006-02-04 11:51:26.000000000 +0000 ++++ dbus-0.23.4/bus/Makefile.am 2006-02-04 11:51:27.000000000 +0000 +@@ -63,7 +63,7 @@ + dbus_daemon_1_LDADD= \ + $(EFENCE) \ + $(DBUS_BUS_LIBS) \ +- $(top_builddir)/dbus/libdbus-convenience.la ++ $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la + + ## note that TESTS has special meaning (stuff to use in make check) + ## so if adding tests not to be run in make check, don't add them to +--- dbus-0.23.4/dbus/Makefile.am.old 2006-02-04 13:27:03.000000000 +0000 ++++ dbus-0.23.4/dbus/Makefile.am 2006-02-04 13:27:04.000000000 +0000 +@@ -144,7 +144,7 @@ + libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) + ## don't export symbols that start with "_" (we use this + ## convention for internal symbols) +-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" ++#libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" + + ## note that TESTS has special meaning (stuff to use in make check) + ## so if adding tests not to be run in make check, don't add them to diff --git a/packages/e17/e-wm_0.16.999.022.bb b/packages/e17/e-wm_0.16.999.023.bb index 60d5fe6571..ef0162a174 100644 --- a/packages/e17/e-wm_0.16.999.022.bb +++ b/packages/e17/e-wm_0.16.999.023.bb @@ -8,9 +8,9 @@ PR = "r3" SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://remove-large-fonts.patch;patch=1 \ - file://disable-splash.patch;patch=1 \ file://Xsession.d/98enlightenment \ cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" +# file://disable-splash.patch;patch=1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ diff --git a/packages/e17/entrance_0.9.0.005.bb b/packages/e17/entrance_0.9.0.005.bb new file mode 100644 index 0000000000..b79e26d4a4 --- /dev/null +++ b/packages/e17/entrance_0.9.0.005.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Entrance is the Enlightenment login manager" +SECTION = "e/apps" +LICENSE = "MIT" +# can also use pam and crypt +DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" +RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" +HOMEPAGE = "http://www.enlightenment.org" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +PR = "r11" + +SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \ + file://config-db.patch;patch=1 \ + file://allow-missing-xsession.patch;patch=1 \ + file://run-Xinit.patch;patch=1 \ + file://set-display-env.patch;patch=1 \ + file://fix-auth-mode.patch;patch=1 \ + file://use-bash.patch;patch=1 \ + file://Sessions" + +S = "${WORKDIR}/entrance-${PV}" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "entrance" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --with-xsession=/etc/X11/Xsession \ + --with-auth-mode=0" + +FILES += "${datadir}" + +do_install_append() { + install -d ${D}/etc/X11/Xsession.d + install -d ${D}/etc/X11/Sessions + + install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions +} diff --git a/packages/efl/e_0.16.999.022.bb b/packages/efl/e_0.16.999.023.bb index 35bb776269..35bb776269 100644 --- a/packages/efl/e_0.16.999.022.bb +++ b/packages/efl/e_0.16.999.023.bb diff --git a/packages/efl/ecore-fb_0.9.9.022.bb b/packages/efl/ecore-fb_0.9.9.023.bb index a5a843aeb4..a5a843aeb4 100644 --- a/packages/efl/ecore-fb_0.9.9.022.bb +++ b/packages/efl/ecore-fb_0.9.9.023.bb diff --git a/packages/efl/ecore-native_0.9.9.022.bb b/packages/efl/ecore-native_0.9.9.023.bb index 299470841c..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.022.bb +++ b/packages/efl/ecore-native_0.9.9.023.bb diff --git a/packages/efl/ecore-x11_0.9.9.022.bb b/packages/efl/ecore-x11_0.9.9.023.bb index 0927b59e03..0927b59e03 100644 --- a/packages/efl/ecore-x11_0.9.9.022.bb +++ b/packages/efl/ecore-x11_0.9.9.023.bb diff --git a/packages/efl/edb-native_1.0.5.004.bb b/packages/efl/edb-native_1.0.5.005.bb index d83a3b77c6..d83a3b77c6 100644 --- a/packages/efl/edb-native_1.0.5.004.bb +++ b/packages/efl/edb-native_1.0.5.005.bb diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.005.bb index 30c14d3d58..30c14d3d58 100644 --- a/packages/efl/edb_1.0.5.004.bb +++ b/packages/efl/edb_1.0.5.005.bb diff --git a/packages/efl/edje-native_0.5.0.022.bb b/packages/efl/edje-native_0.5.0.023.bb index 523c38ba46..44b4e80c20 100644 --- a/packages/efl/edje-native_0.5.0.022.bb +++ b/packages/efl/edje-native_0.5.0.023.bb @@ -18,6 +18,8 @@ do_configure_prepend() { sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c # sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c # sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } do_stage_append() { diff --git a/packages/efl/edje_0.5.0.022.bb b/packages/efl/edje_0.5.0.023.bb index 9315639af2..9315639af2 100644 --- a/packages/efl/edje_0.5.0.022.bb +++ b/packages/efl/edje_0.5.0.023.bb diff --git a/packages/efl/eet-native_0.9.10.022.bb b/packages/efl/eet-native_0.9.10.023.bb index fa20c9fb30..fa20c9fb30 100644 --- a/packages/efl/eet-native_0.9.10.022.bb +++ b/packages/efl/eet-native_0.9.10.023.bb diff --git a/packages/efl/eet_0.9.10.022.bb b/packages/efl/eet_0.9.10.023.bb index c0f89b1064..c0f89b1064 100644 --- a/packages/efl/eet_0.9.10.022.bb +++ b/packages/efl/eet_0.9.10.023.bb diff --git a/packages/efl/embryo-native_0.9.1.022.bb b/packages/efl/embryo-native_0.9.1.023.bb index a33adb7bd2..a33adb7bd2 100644 --- a/packages/efl/embryo-native_0.9.1.022.bb +++ b/packages/efl/embryo-native_0.9.1.023.bb diff --git a/packages/efl/embryo_0.9.1.022.bb b/packages/efl/embryo_0.9.1.023.bb index 1802da1bca..1802da1bca 100644 --- a/packages/efl/embryo_0.9.1.022.bb +++ b/packages/efl/embryo_0.9.1.023.bb diff --git a/packages/efl/emotion_20060128.bb b/packages/efl/emotion_20060128.bb index e450cf1d3a..a567c030cc 100644 --- a/packages/efl/emotion_20060128.bb +++ b/ |