diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-20 14:40:11 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-20 14:40:11 +0000 |
| commit | c0ae5d40cf58e93024c42201fcc867076d2df2d2 (patch) | |
| tree | cc245752ec729c76b4e479db7a94b4becb5d9952 /packages | |
| parent | 18789351ec81d64b4c41e7f90aaa59b6fae0ece2 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/06/20 16:29:43+02:00 utwente.nl!koen
Add missing .inc while nobody is looking
2005/06/20 15:41:28+02:00 utwente.nl!koen
update gconf-osso, courtesy Florian Boor
BKrev: 42b6d54bddf8pOoF8wqQzVHgWz_SRQ
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gpe-todo/gpe-todo.inc | 0 | ||||
| -rw-r--r-- | packages/maemo/gconf-osso/free-entry-fix.diff | 0 | ||||
| -rw-r--r-- | packages/maemo/gconf-osso/no-po-no-examples.diff | 0 | ||||
| -rw-r--r-- | packages/maemo/gconf-osso/service-file.diff | 0 | ||||
| -rw-r--r-- | packages/maemo/gconf-osso_2.6.4-3.1osso13.bb | 7 |
5 files changed, 6 insertions, 1 deletions
diff --git a/packages/gpe-todo/gpe-todo.inc b/packages/gpe-todo/gpe-todo.inc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-todo/gpe-todo.inc diff --git a/packages/maemo/gconf-osso/free-entry-fix.diff b/packages/maemo/gconf-osso/free-entry-fix.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo/gconf-osso/free-entry-fix.diff diff --git a/packages/maemo/gconf-osso/no-po-no-examples.diff b/packages/maemo/gconf-osso/no-po-no-examples.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo/gconf-osso/no-po-no-examples.diff diff --git a/packages/maemo/gconf-osso/service-file.diff b/packages/maemo/gconf-osso/service-file.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo/gconf-osso/service-file.diff diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb index 8792aa19df..8e5975137e 100644 --- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb +++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb @@ -6,10 +6,14 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" PROVIDES = "gconf" RPROVIDES = "gconf" -PR = "r1" +PR = "r3" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${PV}.tar.gz \ file://gconf-update.patch;patch=1;pnum=0 \ + file://free-entry-fix.diff;patch=1 \ + file://no-po-no-examples.diff;patch=1 \ + file://service-file.diff;patch=1 \ + file://gconf-daemon-dbus-oe.sh \ file://gconf-daemon-oe.sh" S = "${WORKDIR}/gconf2-2.6.4/GConf-2.6.4" @@ -26,6 +30,7 @@ HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-valu do_install_append () { install -d ${D}/${sysconfdir}/osso-af-init install -m755 ${WORKDIR}/gconf-daemon-oe.sh ${D}${sysconfdir}/osso-af-init/gconf-daemon.sh + install -m755 ${WORKDIR}/gconf-daemon-dbus-oe.sh ${D}${sysconfdir}/osso-af-init/gconf-daemon-dbus.sh install -d ${D}${sysconfdir}/osso-af-init/gconf-dir install -d ${D}/var/lib/gconf } |