[oe-commits] org.oe.dev merge of '3802d5aa3022a434a47a62758a780bebfcff5c4d'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Feb 28 12:04:50 UTC 2008
merge of '3802d5aa3022a434a47a62758a780bebfcff5c4d'
and 'a7772b5814e2f3ffb39d7d0d87094111a5bf3a45'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 662ae9dafb4c25857c0afa36b3303e10fdd8cea6
ViewMTN: http://monotone.openembedded.org/revision/info/662ae9dafb4c25857c0afa36b3303e10fdd8cea6
Files:
1
packages/dbus/dbus-1.1.4
packages/dbus/dbus-1.1.20
packages/dbus/dbus-native_1.1.4.bb
packages/dbus/dbus-native_1.1.20.bb
packages/dbus/dbus_1.1.4.bb
packages/dbus/dbus_1.1.20.bb
packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch
conf/distro/include/preferred-om-2008-versions.inc
packages/busybox/busybox-1.9.1/defconfig
packages/busybox/busybox.inc
packages/busybox/busybox_1.9.1.bb
packages/dbus/dbus-native_1.0.2.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.2.bb
packages/freesmartphone/pyneod_svn.bb
packages/python/python-2.5.2/sitecustomize.py
packages/xvidcap
contrib/powered-by-oe.svg
packages/classpath/classpath-minimal_0.97.bb
packages/classpath/classpath_0.97.bb
packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch
packages/xvidcap/xvidcap.inc
packages/xvidcap/xvidcap_1.1.6.bb
packages/xvidcap/xvidcap_1.1.7rc1.bb
conf/distro/include/sane-srcrevs.inc
packages/boost/boost_1.33.0.bb
packages/boost/boost_1.33.1.bb
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath.inc
packages/classpath/classpath_0.96.1.bb
packages/docbook-utils/docbook-utils-native_0.6.14.bb
packages/ffmpeg/ffmpeg_svn.bb
packages/gcc/gcc-cross-initial.inc
packages/gcc/gcc-cross-sdk_3.4.3.bb
packages/gcc/gcc-cross-sdk_3.4.4.bb
packages/gcc/gcc-cross-sdk_4.1.0.bb
packages/gcc/gcc-cross-sdk_4.1.1.bb
packages/gcc/gcc-cross-sdk_4.1.2.bb
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gcc/gcc-cross_3.4.3.bb
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc-cross_4.0.0.bb
packages/gcc/gcc-cross_4.0.2.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc3-build-cross.inc
packages/gcc/gcc3-build-sdk.inc
packages/gcc/gcc4-build-sdk.inc
packages/linux/linux-ixp4xx/defconfig-2.6.24
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
packages/meta/slugos-packages.bb
packages/netsurf/netsurf_svn.bb
Diffs:
#
# mt diff -r3802d5aa3022a434a47a62758a780bebfcff5c4d -r662ae9dafb4c25857c0afa36b3303e10fdd8cea6
#
#
#
# rename "packages/dbus/dbus-1.1.4"
# to "packages/dbus/dbus-1.1.20"
#
# rename "packages/dbus/dbus-native_1.1.4.bb"
# to "packages/dbus/dbus-native_1.1.20.bb"
#
# rename "packages/dbus/dbus_1.1.4.bb"
# to "packages/dbus/dbus_1.1.20.bb"
#
# add_file "packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch"
# content [c8951ae1f436c9dfbc14cc04cbdc1407c5034693]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [dd29a8bfa10a0d3f786220dee4b2c942deb59552]
# to [7ff18c73f3dc06bcaf921d9ab443d383a6a12a93]
#
# patch "packages/busybox/busybox-1.9.1/defconfig"
# from [f9c49ff1e22a8954779029451df51773b51ed09f]
# to [ff25ec81c1351231f97bffc1ee90939e562137a4]
#
# patch "packages/busybox/busybox.inc"
# from [82ab2ea23b28f3cfde9a11d2718ddbc3ebbb899a]
# to [e17706ff0f8357569cffa7704fe0c16990b62121]
#
# patch "packages/busybox/busybox_1.9.1.bb"
# from [49749d22f545c3b4e7a19e560079375738c0afdb]
# to [611d61a446d2bd0678cce14f4d7f8a7e916ebf9d]
#
# patch "packages/dbus/dbus-native_1.0.2.bb"
# from [fbff414912569dc50e61b109e28f9f86ec259886]
# to [26211c462065427f00f5ba019151740871beb85d]
#
# patch "packages/dbus/dbus-native_1.1.20.bb"
# from [bbd25f9e7c9b77b2605b0107cbe8ef0396dee219]
# to [80d48377314b49295fe94f56ce44b497d2ac75b5]
#
# patch "packages/dbus/dbus.inc"
# from [f59c7592c9d9fa4d19d5c3debfde3b58b9bfdf79]
# to [c0911284b61f4d105576db29453fa27ce6d25f1a]
#
# patch "packages/dbus/dbus_1.0.2.bb"
# from [ae8eb57b8c2a17376e8e93257afc69060cc6a3fd]
# to [962c6b5e32d4892e1a56132c30a8bfe9374c7805]
#
# patch "packages/dbus/dbus_1.1.20.bb"
# from [4586c438a647255b3ee0c4705493aa5f104d5d63]
# to [9a3c726e42fc6c6bc3af37448fa5971843794a7c]
#
# patch "packages/freesmartphone/pyneod_svn.bb"
# from [1c3848f055db08f16822ffa5284a578282a0ee86]
# to [4667d9e21c38f533f4c43794339cdd5b33f9759e]
#
# patch "packages/python/python-2.5.2/sitecustomize.py"
# from [37922f91ecd1cbccb466f30c120aeabfd2a0ae05]
# to [c40f5efdb53149377b28215c2040a8158463d4aa]
#
============================================================
--- packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch c8951ae1f436c9dfbc14cc04cbdc1407c5034693
+++ packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch c8951ae1f436c9dfbc14cc04cbdc1407c5034693
@@ -0,0 +1,14 @@
+Index: dbus-1.1.20/tools/dbus-launch.c
+===================================================================
+--- dbus-1.1.20.orig/tools/dbus-launch.c
++++ dbus-1.1.20/tools/dbus-launch.c
+@@ -966,7 +966,9 @@ main (int argc, char **argv)
+ char write_pid_fd_as_string[MAX_FD_LEN];
+ char write_address_fd_as_string[MAX_FD_LEN];
+
++#ifdef DBUS_BUILD_X11
+ xdisplay = NULL;
++#endif
+
+ if (close_stderr)
+ do_close_stderr ();
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc dd29a8bfa10a0d3f786220dee4b2c942deb59552
+++ conf/distro/include/preferred-om-2008-versions.inc 7ff18c73f3dc06bcaf921d9ab443d383a6a12a93
@@ -1,5 +1,6 @@
-PREFERRED_VERSION_dbus = "1.1.4"
PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus-glib = "0.74"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.24"
PREFERRED_VERSION_pulseaudio = "0.9.9"
============================================================
--- packages/busybox/busybox-1.9.1/defconfig f9c49ff1e22a8954779029451df51773b51ed09f
+++ packages/busybox/busybox-1.9.1/defconfig ff25ec81c1351231f97bffc1ee90939e562137a4
@@ -378,30 +378,30 @@ CONFIG_XARGS=y
# CONFIG_FEATURE_SHADOWPASSWDS is not set
# CONFIG_USE_BB_SHADOW is not set
# CONFIG_USE_BB_PWD_GRP is not set
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-CONFIG_DELGROUP=y
-CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-CONFIG_ADDUSER=y
-CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
+# CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
# CONFIG_PAM is not set
# CONFIG_LOGIN_SCRIPTS is not set
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_FEATURE_NOLOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
# CONFIG_CRYPTPW is not set
# CONFIG_CHPASSWD is not set
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+# CONFIG_SU is not set
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
# CONFIG_SULOGIN is not set
-CONFIG_VLOCK=y
+# CONFIG_VLOCK is not set
#
# Linux Ext2 FS Progs
============================================================
--- packages/busybox/busybox.inc 82ab2ea23b28f3cfde9a11d2718ddbc3ebbb899a
+++ packages/busybox/busybox.inc e17706ff0f8357569cffa7704fe0c16990b62121
@@ -11,19 +11,21 @@ PRIORITY = "required"
SECTION = "base"
PRIORITY = "required"
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
- file://busybox-cron \
- file://busybox-httpd \
- file://busybox-udhcpd \
- file://default.script \
- file://dhcp-hostname.patch;patch=1 \
- file://hwclock.sh \
- file://ifupdown-spurious-environ.patch;patch=1 \
- file://mount.busybox \
- file://syslog \
- file://syslog.conf \
- file://udhcpscript.patch;patch=1 \
- file://umount.busybox"
+SRC_URI = "\
+ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+ file://busybox-cron \
+ file://busybox-httpd \
+ file://busybox-udhcpd \
+ file://default.script \
+ file://dhcp-hostname.patch;patch=1 \
+ file://hwclock.sh \
+ file://ifupdown-spurious-environ.patch;patch=1 \
+ file://mount.busybox \
+ file://syslog \
+ file://syslog.conf \
+ file://udhcpscript.patch;patch=1 \
+ file://umount.busybox \
+"
SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
@@ -34,7 +36,7 @@ FILES_${PN}-udhcpd = "${sysconfdir}/init
FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-FILES_${PN} += " ${datadir}/udhcpc"
+FILES_${PN} += "${datadir}/udhcpc"
INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
@@ -47,11 +49,73 @@ inherit cml1 update-rc.d
inherit cml1 update-rc.d
-do_compile () {
- unset CFLAGS
+do_compile() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
base_do_compile
}
+do_install () {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ install -d ${D}${sysconfdir}/init.d
+ oe_runmake "PREFIX=${D}" install
+ cp -pPR ${S}/_install/* ${D}/
+
+ # Move everything to /busybox (not supposed to end up in any package)
+ install -d ${D}/busybox
+ ls ${D} -R
+
+ cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+ # Move the busybox binary back to /bin
+ install -d ${D}${base_bindir}
+ mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+ # Move back the sh symlink
+ test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+
+ install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+ install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+ if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+ # Move crond back to /usr/sbin/crond
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+ # Move httpd back to /usr/sbin/httpd
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+ install -d ${D}/srv/www
+ fi
+ if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+ # Move udhcpd back to /usr/sbin/udhcpd
+ install -d ${D}${sbindir}
+ mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+ install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+ # Move hwclock back to /sbin/hwclock
+ install -d ${D}${base_sbindir}
+ mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+ install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+ fi
+ if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+ # Move dhcpc back to /usr/sbin/udhcpc
+ install -d ${D}${base_sbindir}
+ mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+ install -d ${D}${sysconfdir}/udhcpc.d
+ install -d ${D}${datadir}/udhcpc
+ install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+ install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+ fi
+
+ install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
pkg_postinst_${PN} () {
# If we are not making an image we create links for the utilities that doesn't exist
# so the update-alternatives script will get the utilities it needs
@@ -62,3 +126,34 @@ pkg_postinst_${PN} () {
# This adds the links, remember that this has to work when building an image too, hence the $D
while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
}
+
+pkg_prerm_${PN} () {
+ # This is so you can make busybox commit suicide - removing busybox with no other packages
+ # providing its files, this will make update-alternatives work, but the update-rc.d part
+ # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+ tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+ ln -s /bin/busybox $tmpdir/[
+ ln -s /bin/busybox $tmpdir/test
+ ln -s /bin/busybox $tmpdir/head
+ ln -s /bin/busybox $tmpdir/sh
+ ln -s /bin/busybox $tmpdir/basename
+ ln -s /bin/busybox $tmpdir/echo
+ ln -s /bin/busybox $tmpdir/mv
+ ln -s /bin/busybox $tmpdir/ln
+ ln -s /bin/busybox $tmpdir/dirname
+ ln -s /bin/busybox $tmpdir/rm
+ ln -s /bin/busybox $tmpdir/sed
+ ln -s /bin/busybox $tmpdir/sort
+ export PATH=$PATH:$tmpdir
+
+ while read link
+ do
+ case "$link" in
+ /*/*/*) to="../../bin/busybox";;
+ /bin/*) to="busybox";;
+ /*/*) to="../bin/busybox";;
+ esac
+ bn=`basename $link`
+ sh /usr/bin/update-alternatives --remove $bn $to
+ done </etc/busybox.links
+}
============================================================
--- packages/busybox/busybox_1.9.1.bb 49749d22f545c3b4e7a19e560079375738c0afdb
+++ packages/busybox/busybox_1.9.1.bb 611d61a446d2bd0678cce14f4d7f8a7e916ebf9d
@@ -1,5 +1,5 @@ require busybox.inc
require busybox.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
@@ -23,91 +23,3 @@ do_configure () {
install -m 0644 ${WORKDIR}/defconfig ${S}/.config
cml1_do_configure
}
-
-do_compile () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- base_do_compile
-}
-
-do_install () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- install -d ${D}${sysconfdir}/init.d
- oe_runmake "PREFIX=${D}" install
- cp -pPR ${S}/_install/* ${D}/
-
- # Move everything to /busybox (not supposed to end up in any package)
- install -d ${D}/busybox
- ls ${D} -R
-
- cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
- # Move the busybox binary back to /bin
- install -d ${D}${base_bindir}
- mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
- # Move back the sh symlink
- test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
-
- install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
- install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
- if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
- # Move crond back to /usr/sbin/crond
- install -d ${D}${sbindir}
- mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
-
- install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
- fi
- if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
- # Move httpd back to /usr/sbin/httpd
- install -d ${D}${sbindir}
- mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-
- install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
- install -d ${D}/srv/www
- fi
- if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
- # Move udhcpd back to /usr/sbin/udhcpd
- install -d ${D}${sbindir}
- mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-
- install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
- fi
- if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
- # Move hwclock back to /sbin/hwclock
- install -d ${D}${base_sbindir}
- mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-
- install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
- fi
- if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
- # Move dhcpc back to /usr/sbin/udhcpc
- install -d ${D}${base_sbindir}
- mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
-
- install -d ${D}${sysconfdir}/udhcpc.d
- install -d ${D}${datadir}/udhcpc
- install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
- install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
- fi
-
- install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
-}
-
-pkg_prerm_${PN} () {
- # This is so you can make busybox commit suicide - removing busybox with no other packages
- # providing its files, this will make update-alternatives work, but the update-rc.d part
- # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
- tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
- ln -s /bin/busybox $tmpdir/[
- ln -s /bin/busybox $tmpdir/test
- ln -s /bin/busybox $tmpdir/head
- ln -s /bin/busybox $tmpdir/sh
- ln -s /bin/busybox $tmpdir/basename
- ln -s /bin/busybox $tmpdir/echo
- ln -s /bin/busybox $tmpdir/mv
- ln -s /bin/busybox $tmpdir/ln
- ln -s /bin/busybox $tmpdir/dirname
- ln -s /bin/busybox $tmpdir/rm
- ln -s /bin/busybox $tmpdir/sed
- ln -s /bin/busybox $tmpdir/sort
- export PATH=$PATH:$tmpdir
- while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links
-}
============================================================
--- packages/dbus/dbus-native_1.0.2.bb fbff414912569dc50e61b109e28f9f86ec259886
+++ packages/dbus/dbus-native_1.0.2.bb 26211c462065427f00f5ba019151740871beb85d
@@ -1,6 +1,7 @@ require dbus.inc
require dbus.inc
-DEFAULT_PREFERENCE = "1"
+DEFAULT_PREFERENCE = "-1"
+
inherit native
DEPENDS = "glib-2.0-native libxml2-native expat-native"
@@ -25,4 +26,3 @@ do_install() {
do_install() {
:
}
-
============================================================
--- packages/dbus/dbus-native_1.1.4.bb bbd25f9e7c9b77b2605b0107cbe8ef0396dee219
+++ packages/dbus/dbus-native_1.1.20.bb 80d48377314b49295fe94f56ce44b497d2ac75b5
@@ -5,9 +5,10 @@ SRC_URI = "\
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
SRC_URI = "\
- http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+ http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \
file://tmpdir.patch;patch=1 \
+ file://fix-dbus-launch-x11.patch;patch=1 \
file://dbus-1.init \
"
============================================================
--- packages/dbus/dbus.inc f59c7592c9d9fa4d19d5c3debfde3b58b9bfdf79
+++ packages/dbus/dbus.inc c0911284b61f4d105576db29453fa27ce6d25f1a
@@ -1,13 +1,11 @@ DEPENDS = "expat glib-2.0 virtual/libint
DESCRIPTION = "A message bus system for inter-process communication"
HOMEPAGE = "http://dbus.freedesktop.org"
SECTION = "base"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = "\
- http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \
+ http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \
file://tmpdir.p%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -ra7772b5814e2f3ffb39d7d0d87094111a5bf3a45 -r662ae9dafb4c25857c0afa36b3303e10fdd8cea6
#
#
#
# add_dir "packages/xvidcap"
#
# add_file "contrib/powered-by-oe.svg"
# content [81bac4d7268b732f20b892530b7c4373120f1019]
#
# add_file "packages/classpath/classpath-minimal_0.97.bb"
# content [1dbca8bbd4be527feefdde7d7fd2126af6490e7b]
#
# add_file "packages/classpath/classpath_0.97.bb"
# content [db8b170f0f6f53145caf1d439efa49971f8c4475]
#
# add_file "packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch"
# content [fbe087243a3c7dd7ec8aeab1be37b1dda3fbfa38]
#
# add_file "packages/xvidcap/xvidcap.inc"
# content [70f22e3dac547564bd7b3c4e29b15d7b1458a393]
#
# add_file "packages/xvidcap/xvidcap_1.1.6.bb"
# content [893d6c7e33ce7d9566fa9ee2dc59153563e08828]
#
# add_file "packages/xvidcap/xvidcap_1.1.7rc1.bb"
# content [02497635f8ca2648983f1a14199a3e1da3b5f47d]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7f0a2b14eab640439e8db8a4b0bc975adaa6c148]
# to [426c0d5c30aa55ac9f2a23243ba2605968d2f3be]
#
# patch "packages/boost/boost_1.33.0.bb"
# from [9250e9c2e1581c023e64867372028588784a5709]
# to [e112502158b7f977f56f3408d0d4e06562698c72]
#
# patch "packages/boost/boost_1.33.1.bb"
# from [b7d50805cd778e9f1ace2effa81618d4968d1175]
# to [9e61fbe13da215613e0df5e8e49a650c399e667d]
#
# patch "packages/classpath/classpath-minimal_0.96.1.bb"
# from [a528f080620fffa4c0b22221b0f0cb95c6b6b9b7]
# to [dc3a72abbdd2e121e00c6ea3aeaf5434f164c02f]
#
# patch "packages/classpath/classpath.inc"
# from [0f2d68f2974e2300682063936e5b038bd33e9870]
# to [b992c2ac2ea9164632c7cc97aadc93694ae7d6db]
#
# patch "packages/classpath/classpath_0.96.1.bb"
# from [d2c2deaabb0157794cca634460c4e588ebbfc5cf]
# to [214aa050c2a1948b4e32c88821cce2b89be5f74b]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.14.bb"
# from [a71a90f95c1e63d6e70e783d56e0e3d756600f16]
# to [7189c9e70cf87bf7a1cc2980dd19561351b4a37b]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [a88f11ff93c4722033c395383b54f840896271a4]
# to [d2d47408e07ad06f91f35a6b7f6b2233209c0414]
#
# patch "packages/gcc/gcc-cross-initial.inc"
# from [fb66b62909bd934c21054254204b8d744c47c58e]
# to [9ba43750cd0139966a6dcf2b4103056bf5ff486a]
#
# patch "packages/gcc/gcc-cross-sdk_3.4.3.bb"
# from [fa5ca4ad0eaf2ec0fa465b06f463bee485c52b64]
# to [ffaafb6a6ef931a5cd71c7623aba38189dc94161]
#
# patch "packages/gcc/gcc-cross-sdk_3.4.4.bb"
# from [5f68404197e1e64b85ecc871a56c3b92bcf9f7aa]
# to [d3ec03c6a033da2116bc98ad62f5bbd5e55c9d56]
#
# patch "packages/gcc/gcc-cross-sdk_4.1.0.bb"
# from [2cea3da097f8c9f838e82a3e085426ce0916af21]
# to [9ee8cf0ade345ec09bf8fdf048b6e26f46f45b9e]
#
# patch "packages/gcc/gcc-cross-sdk_4.1.1.bb"
# from [5c546cdb3a65f3df1a7baf621b678a749317eb68]
# to [ddd01150678777da335ac78d58df4957ee59644c]
#
# patch "packages/gcc/gcc-cross-sdk_4.1.2.bb"
# from [a242107a56b03242a022e20b178173f22bc0725b]
# to [f6823faca21c5b3fb2b5d4d25f3dd36e55d5001a]
#
# patch "packages/gcc/gcc-cross-sdk_4.2.2.bb"
# from [c51f994c61ce378fb2761f8e6d0cc77071b8dcfe]
# to [fce0dd37759eb94742b68054f611c6107eefb1a9]
#
# patch "packages/gcc/gcc-cross_3.4.3.bb"
# from [ce70bdb3ff0e605e841fa835bc20169914ea708a]
# to [514d5058dc7a33129401ab42cd5549f3cabf0cfe]
#
# patch "packages/gcc/gcc-cross_3.4.4.bb"
# from [453cf98f7ad3555176dec060ff5490029d02f14b]
# to [69929383ab187bf47e33045c5861a05ce0a1c1e5]
#
# patch "packages/gcc/gcc-cross_4.0.0.bb"
# from [c79d4560cc3836f3ce5567ced695e38cd89cf6ff]
# to [66b1c29a2ab7943cc607d286832df71b04a055e3]
#
# patch "packages/gcc/gcc-cross_4.0.2.bb"
# from [a6084e5e13c9ec9dd14a200160e5084964df24f4]
# to [32bf3db753e1a89ae6840f7a83051d90fe0c2a3f]
#
# patch "packages/gcc/gcc-cross_4.1.0.bb"
# from [4f00addbaa7626b70215367ef53de6d49b4c6a7e]
# to [ceefff285e464b7d8c5eb921fa0eb1d5b8e773c0]
#
# patch "packages/gcc/gcc-cross_4.1.1.bb"
# from [58ae5981f8140e05dac1bd3269a880d0ddbbd0d6]
# to [b31cc28d6cd529d33a78cd9bd190c5e48a8e43f2]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [e659d9e6674737d1b04faad23ba65c74a3626216]
# to [4c675cf59006eb6efcd020cc5901707c23d0139f]
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
# from [5ef221a66a8deb2c9907050226443b591077ebc2]
# to [2f16ff83d690b1b8e87a423c4a22b0bc0480f90a]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [638f8a17318b6c935909d7b7f11cc6506e57d6af]
# to [966323ee244047dc2568f0dec747e5437039225f]
#
# patch "packages/gcc/gcc3-build-cross.inc"
# from [f5b8eae287025914fe8384905949c0372af6d9d0]
# to [6b61dc663b321ffd6f1992e3587e47c2440c31fe]
#
# patch "packages/gcc/gcc3-build-sdk.inc"
# from [16e2c3d38974861286d1f0f8bc24f824b1a11969]
# to [e80775fa7cdad10299b39edefff6b5cdb7120bda]
#
# patch "packages/gcc/gcc4-build-sdk.inc"
# from [803d124f9bdd702633e7820806cfc41d7703ddc8]
# to [87829c7148dd1ac08f628d6ee4be53f410490e7b]
#
# patch "packages/linux/linux-ixp4xx/defconfig-2.6.24"
# from [5eb44aa6039b4c47d7325b8eee80c1c4930ce5bf]
# to [3b68cb7087ef7eec7a24b4715e803ca816082216]
#
# patch "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24"
# from [2358fe351f97ad015b3e58e2534dd17058c60d52]
# to [07dc3a97521dab74f9bbe1071d964043851ea50a]
#
# patch "packages/meta/slugos-packages.bb"
# from [a31e7a2c5a2bf5122f4c51d5daa97760c14afeec]
# to [e54d5a5c1162e4b86a5fd3926a350f1ed6d41552]
#
# patch "packages/netsurf/netsurf_svn.bb"
# from [c00865f4500c29a5271184c5babd7fc2a83ef465]
# to [b557c1ebde54629ce1133b0356cb37015bfb0272]
#
============================================================
--- contrib/powered-by-oe.svg 81bac4d7268b732f20b892530b7c4373120f1019
+++ contrib/powered-by-oe.svg 81bac4d7268b732f20b892530b7c4373120f1019
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg1"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ width="8.0000000cm"
+ height="6.0000000cm"
+ sodipodi:docname="oe.svg"
+ sodipodi:docbase="/home/mallum/Desktop"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata22">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs3" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.621852"
+ inkscape:cx="141.73228"
+ inkscape:cy="106.29921"
+ inkscape:window-width="1600"
+ inkscape:window-height="972"
+ showguides="true"
+ snaptoguides="true"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="svg1" />
+ <path
+ style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+ d="M 150.60592,99.743209 C 150.60592,134.90946 122.06521,163.45016 86.89898,163.45016 C 51.732741,163.45016 23.192037,134.90946 23.192037,99.743209 C 23.192037,64.576987 51.732741,36.036281 86.89898,36.036281 C 122.06521,36.036281 150.60592,64.576987 150.60592,99.743209 z M 125.59088,99.743225 C 125.59088,131.0126 108.25691,156.39065 86.898996,156.39065 C 65.541064,156.39065 48.207098,131.0126 48.207098,99.743225 C 48.207098,68.473843 65.541064,43.095803 86.898996,43.095803 C 108.25691,43.095803 125.59088,68.473843 125.59088,99.743225 z "
+ id="path861" />
+ <path
+ style="fill:#9ca3c2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d="M 132.75147,99.35642 C 132.87448,72.917742 151.72789,35.858725 196.63972,35.835097 C 207.45455,35.890687 223.63895,43.346804 225.55952,49.517017 C 183.8404,33.116588 151.35632,67.61955 151.26456,99.8654 C 151.42728,132.36573 184.86806,166.68422 225.66493,149.78379 C 222.82764,155.71089 208.80153,163.59326 196.50275,163.65048 C 151.84536,163.85942 132.62846,126.04958 132.75147,99.35642 z "
+ id="path869"
+ sodipodi:nodetypes="csczcsz" />
+ <path
+ style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+ d="M 173.2093,70.12526 C 187.1012,69.82853 198.1696,84.01726 198.3348,99.56551 C 198.4135,115.2003 187.9133,129.6873 173.1847,129.1256 C 187.7964,120.1516 188.1917,102.48494 188.1594,99.61621 C 188.127,96.66092 187.449,78.73875 173.2093,70.12526 z "
+ id="path877"
+ sodipodi:nodetypes="czczc" />
+ <g
+ id="g921"
+ transform="matrix(0.680271,0,0,0.680271,-188.5137,-257.4138)">
+ <text
+ xml:space="preserve"
+ style="font-size:56px;line-height:100%;stroke-width:3pt;font-family:Verdana"
+ x="417.81042"
+ y="1061.9202"
+ id="text902"
+ sodipodi:linespacing="100%"
+ transform="matrix(0.631134,0,0,0.631134,3.430357,0)"> <tspan
+ id="tspan903"
+ style="fill:#000000;fill-opacity:1">open</tspan> </text>
+ <text
+ xml:space="preserve"
+ style="font-size:56px;line-height:100%;fill:#929292;stroke-width:3pt;font-family:Verdana"
+ x="567.8233"
+ y="1061.9202"
+ id="text905"
+ sodipodi:linespacing="100%"
+ transform="scale(0.631134,0.631134)"> <tspan
+ id="tspan906"
+ style="fill:#929292;fill-opacity:1">embedded</tspan> </text>
+ </g>
+ <g
+ id="g945"
+ style="stroke:#000000;stroke-opacity:0.12000002"
+ transform="translate(0,8)">
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-opacity:0.12000002"
+ d="M 210.10063,527.6401 L 600.37556,527.6401"
+ id="path840"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 577.3438,527.64009 C 577.3438,579.33452 535.3889,621.28942 483.69447,621.28942 C 432.00004,621.28942 390.04514,579.33452 390.04514,527.64009 C 390.04514,475.94566 432.00004,433.99076 483.69447,433.99076 C 535.3889,433.99076 577.3438,475.94566 577.3438,527.64009 z "
+ id="path849"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 378.24332,527.64008 C 378.24332,558.43082 353.25373,583.4204 322.46301,583.4204 C 291.67226,583.4204 266.68267,558.43082 266.68267,527.64008 C 266.68267,496.84933 291.67226,471.85976 322.46301,471.85976 C 353.25373,471.85976 378.24332,496.84933 378.24332,527.64008 z "
+ id="path839"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 322.463,422.21153 L 322.463,633.06864"
+ id="path841"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 539.4748,527.64009 C 539.4748,558.43083 514.48521,583.42041 483.69449,583.42041 C 452.90374,583.42041 427.91415,558.43083 427.91415,527.64009 C 427.91415,496.84934 452.90374,471.85977 483.69449,471.85977 C 514.48521,471.85977 539.4748,496.84934 539.4748,527.64009 z "
+ id="path850"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 483.69448,422.21153 L 483.69448,633.06864"
+ id="path851"
+ sodipodi:nodetypes="cc"
+ transform="matrix(0.680271,0,0,0.680271,-132.4632,-267.1952)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.7668311;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 144.34955,91.743214 C 144.34955,123.45594 118.61168,149.1938 86.89897,149.1938 C 55.186251,149.1938 29.4484,123.45594 29.4484,91.743214 C 29.4484,60.030495 55.186251,34.292644 86.89897,34.292644 C 118.61168,34.292644 144.34955,60.030495 144.34955,91.743214 z "
+ id="path943" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.7668311;stroke-linejoin:round;stroke-opacity:0.12000002"
+ d="M 254.0307,91.74305 C 254.0307,123.45578 228.29283,149.19364 196.58012,149.19364 C 164.8674,149.19364 139.12954,123.45578 139.12954,91.74305 C 139.12954,60.030332 164.8674,34.29248 196.58012,34.29248 C 228.29283,34.29248 254.0307,60.030332 254.0307,91.74305 z "
+ id="path944" />
+ </g>
+ <text
+ sodipodi:linespacing="100%"
+ id="text2180"
+ y="24.027855"
+ x="71.040924"
+ style="font-size:24.0431633px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#929292;stroke-width:3pt;font-family:Verdana"
+ xml:space="preserve"><tspan
+ sodipodi:role="line"
+ id="tspan2195"
+ x="71.040924"
+ y="24.027855">Powered by</tspan></text>
+</svg>
============================================================
--- packages/classpath/classpath-minimal_0.97.bb 1dbca8bbd4be527feefdde7d7fd2126af6490e7b
+++ packages/classpath/classpath-minimal_0.97.bb 1dbca8bbd4be527feefdde7d7fd2126af6490e7b
@@ -0,0 +1,15 @@
+require classpath.inc
+
+PR = "r0"
+
+PROVIDES = "${PN} classpath"
+
+EXTRA_OECONF += "\
+ --enable-local-sockets \
+ --disable-alsa \
+ --disable-gconf-peer \
+ --disable-gtk-peer \
+ --disable-plugin \
+ --disable-dssi \
+ --disable-examples \
+ "
============================================================
--- packages/classpath/classpath_0.97.bb db8b170f0f6f53145caf1d439efa49971f8c4475
+++ packages/classpath/classpath_0.97.bb db8b170f0f6f53145caf1d439efa49971f8c4475
@@ -0,0 +1,18 @@
+require classpath.inc
+
+PR = "r0"
+
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+ --disable-alsa \
+ --disable-dssi \
+ --disable-qt4-peer \
+ --disable-plugin \
+ --enable-gconf-peer \
+ --enable-gtk-peer \
+ --enable-local-sockets \
+ --with-vm=java \
+ "
+
+
============================================================
--- packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch fbe087243a3c7dd7ec8aeab1be37b1dda3fbfa38
+++ packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch fbe087243a3c7dd7ec8aeab1be37b1dda3fbfa38
@@ -0,0 +1,25 @@
+*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
+--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
+***************
+*** 57,66 ****
+ CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
+
+ modules modules_install clean:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
+
+ install:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
+
+ else
+
+--- 57,66 ----
+ CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
+
+ modules modules_install clean:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
+
+ install:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
+
+ else
+
============================================================%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list