diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-08-01 12:21:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-01 12:21:31 +0000 |
| commit | 12538fa1272569811b6b8a3fbfaf68457ea0735a (patch) | |
| tree | 4716a02dc5263189817fca373a03b1a9106dd622 | |
| parent | 58d54c73261efab44d4472f91bcb92817bd18c56 (diff) | |
| download | openembedded-core-12538fa1272569811b6b8a3fbfaf68457ea0735a.tar.gz openembedded-core-12538fa1272569811b6b8a3fbfaf68457ea0735a.tar.bz2 openembedded-core-12538fa1272569811b6b8a3fbfaf68457ea0735a.zip | |
ohm: Drop patch applied upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2263 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/ohm/files/libtool_fix.patch | 21 | ||||
| -rw-r--r-- | meta/packages/ohm/ohm_git.bb | 3 |
2 files changed, 1 insertions, 23 deletions
diff --git a/meta/packages/ohm/files/libtool_fix.patch b/meta/packages/ohm/files/libtool_fix.patch deleted file mode 100644 index 09c473b3c1..0000000000 --- a/meta/packages/ohm/files/libtool_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - ohmd/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: git/ohmd/Makefile.am -=================================================================== ---- git.orig/ohmd/Makefile.am 2007-06-27 12:21:04.000000000 +0100 -+++ git/ohmd/Makefile.am 2007-06-27 12:21:29.000000000 +0100 -@@ -69,10 +69,10 @@ ohm-marshal.h: ohm-marshal.list - @GLIB_GENMARSHAL@ $< --prefix=ohm_marshal --header > $@ - - ohm-dbus-manager.h: ohm-dbus-manager.xml -- libtool --mode=execute dbus-binding-tool --prefix=ohm_manager --mode=glib-server --output=ohm-dbus-manager.h $(srcdir)/ohm-dbus-manager.xml -+ $(LIBTOOL) --mode=execute dbus-binding-tool --prefix=ohm_manager --mode=glib-server --output=ohm-dbus-manager.h $(srcdir)/ohm-dbus-manager.xml - - ohm-dbus-keystore.h: ohm-dbus-keystore.xml -- libtool --mode=execute dbus-binding-tool --prefix=ohm_keystore --mode=glib-server --output=ohm-dbus-keystore.h $(srcdir)/ohm-dbus-keystore.xml -+ $(LIBTOOL) --mode=execute dbus-binding-tool --prefix=ohm_keystore --mode=glib-server --output=ohm-dbus-keystore.h $(srcdir)/ohm-dbus-keystore.xml - - CLEANFILES = $(BUILT_SOURCES) - diff --git a/meta/packages/ohm/ohm_git.bb b/meta/packages/ohm/ohm_git.bb index ae6976e372..4ef1a6dfa9 100644 --- a/meta/packages/ohm/ohm_git.bb +++ b/meta/packages/ohm/ohm_git.bb @@ -4,8 +4,7 @@ LICENSE = "LGPL" DEPENDS = "dbus-glib intltool-native hal" RDEPENDS += "udev hal-info" -SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \ - file://libtool_fix.patch;patch=1" +SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git" PV = "0.0+git${SRCDATE}" PR = "r1" |