diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-02-06 18:41:09 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-06 18:41:09 +0000 |
| commit | 27651b95cc9880d646b60e62686bbd1b000556ba (patch) | |
| tree | df9156dcdda54861d251b03192d3a13fc7e3bfa1 /packages | |
| parent | 4476d4b3760464127d42bf6288405d0f4d5bb1a8 (diff) | |
| parent | 5c70d86825ced73fe07d02a4647e70c54f2efe07 (diff) | |
merge of 0b31d87c1b9bcc0d2789be6377713fc1adcc891a
and 939b3d278f2da67c4ed00b67eabd89eb6d0c0f59
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/e17/e-wm_0.16.999.023.bb | 12 | ||||
| -rw-r--r-- | packages/slugos-init/files/boot/disk | 2 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/packages/e17/e-wm_0.16.999.023.bb b/packages/e17/e-wm_0.16.999.023.bb index ef0162a174..8bca19b616 100644 --- a/packages/e17/e-wm_0.16.999.023.bb +++ b/packages/e17/e-wm_0.16.999.023.bb @@ -8,8 +8,8 @@ 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://Xsession.d/98enlightenment \ - cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" + 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 \ @@ -36,10 +36,10 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" 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}:' - mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" - mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" - mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" - mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" +# mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" +# mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" +# mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" +# mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" } do_install_append() { diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index 724dc3af5d..6dd7788197 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -20,6 +20,8 @@ then # wait if required test "$sleep" -gt 0 && sleep "$sleep" # + # proc is needed for UUID mount + mount -t proc proc /proc # Mount read-write because before exec'ing init # If a UUID is given (in the environment) this # is used in preference to the device, but if diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index ed183b9278..3f1ab456ac 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r56" +PR = "r57" SRC_URI = "file://boot/flash \ file://boot/disk \ |