diff options
| author | Justin Patrin <papercrane@gmail.com> | 2005-08-20 07:45:31 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-20 07:45:31 +0000 |
| commit | 3379fc0e5603612de28e61dc4bf38f4a57ee731f (patch) | |
| tree | 01d4a9f62a13b446d8e25dec03ee9e8fc1d8bd2c /packages/gpe-dm | |
| parent | e3c6bbaf268d45fdbd078d98ef1ed38c09392b0b (diff) | |
Move X scripts which are not GPE specific out of gpe-dm and gpe-session-scripts and into x11-common
For now I have added patches to the makefiles to stop installing of these files but they should be removed from those packagse eventually
I have also added all of these small scripts to OE but these should probably be tarballed somewhere
gpe-dm and gpe-session-scripts now depend on the new x11-common package
Change entrance to depend on the new package
Diffstat (limited to 'packages/gpe-dm')
| -rw-r--r-- | packages/gpe-dm/files/remove-X-scripts.patch | 14 | ||||
| -rw-r--r-- | packages/gpe-dm/gpe-dm_0.47.bb | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/packages/gpe-dm/files/remove-X-scripts.patch b/packages/gpe-dm/files/remove-X-scripts.patch new file mode 100644 index 0000000000..b3c85be788 --- /dev/null +++ b/packages/gpe-dm/files/remove-X-scripts.patch @@ -0,0 +1,14 @@ +diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile +--- gpe-dm-0.47~/Makefile 2005-08-19 18:27:54.000000000 -0700 ++++ gpe-dm-0.47/Makefile 2005-08-19 18:28:37.000000000 -0700 +@@ -31,10 +31,6 @@ + install -d $(DESTDIR)/etc/init.d + install -d $(DESTDIR)/etc/rc2.d + install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm +- install -d $(DESTDIR)/etc/X11 +- install Xsession $(DESTDIR)/etc/X11/Xsession +- install Xinit $(DESTDIR)/etc/X11/Xinit +- install Xserver $(DESTDIR)/etc/X11/Xserver + + clean: clean-po + rm -f gpe-dm gpe-dm.o diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb index b98a235ac5..bc290ebf89 100644 --- a/packages/gpe-dm/gpe-dm_0.47.bb +++ b/packages/gpe-dm/gpe-dm_0.47.bb @@ -5,11 +5,11 @@ DESCRIPTION = "GPE Desktop Manager" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "glib-2.0" -PR = "r4" +DEPENDS = "glib-2.0 x11-common" +RDEPENDS_${PN} += "x11-common" +PR = "r5" INITSCRIPT_NAME = "gpe-dm" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." -SRC_URI += "file://collie-suspend-hack.patch;patch=1 \ - file://Xserver-cxk.patch;patch=1" +SRC_URI += "file://remove-X-scripts.patch;patch=1" |