yum-native: Add patch to fix install paths

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5109 311d38ba-8fff-0310-9ca6-ca027cbcb966
author: Richard Purdie <richard@openedhand.com> 2008-08-26 11:03:13 +0000
committer: Richard Purdie <richard@openedhand.com> 2008-08-26 11:03:13 +0000
commit: 38d187038e93f3fee6144737a8f49a34ef49d757 (patch)
tree: 84fd5fc1134fe7b401f00a6f1222bae6f1bd528e
parent: 020a00ab51ac278567b584fd5ed939919d4930ce (diff)
download: poky-38d187038e93f3fee6144737a8f49a34ef49d757.tar.gz
2 files changed, 91 insertions, 1 deletions
diff --git a/meta/packages/yum/yum-native/paths.patch b/meta/packages/yum/yum-native/paths.patch
new file mode 100644
index 0000000000..ee5c999c4b
--- /dev/null
+++ b/meta/packages/yum/yum-native/paths.patch
@@ -0,0 +1,88 @@
+Index: yum-3.2.18/Makefile
+===================================================================
+--- yum-3.2.18.orig/Makefile    2008-08-23 09:13:56.000000000 +0100
+++ yum-3.2.18/Makefile 2008-08-23 09:18:09.000000000 +0100
+@@ -18,19 +18,19 @@
+        for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
+ 
+ install:
+-       mkdir -p $(DESTDIR)/usr/share/yum-cli
+       mkdir -p $(DESTDIR)$(datadir)/yum-cli
+        for p in $(PYFILES) ; do \
+-               install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \
+               install -m 644 $$p $(DESTDIR)$(datadir)/yum-cli/$$p; \
+        done
+-       mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py $(DESTDIR)/usr/share/yum-cli/yumupd.py
+-       $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
+       mv $(DESTDIR)$(datadir)/yum-cli/yum-updatesd.py $(DESTDIR)$(datadir)/yum-cli/yumupd.py
+       $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)$(datadir)/yum-cli', 1, '$(PYDIR)', 1)"
+ 
+-       mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
+-       install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
+-       install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
+       mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
+       install -m 755 bin/yum.py $(DESTDIR)$(bindir)/yum
+       install -m 755 bin/yum-updatesd.py $(DESTDIR)$(sbindir)/yum-updatesd
+ 
+-       mkdir -p $(DESTDIR)/var/cache/yum
+-       mkdir -p $(DESTDIR)/var/lib/yum 
+       mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
+       mkdir -p $(DESTDIR)$(localstatedir)/lib/yum     
+ 
+        for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
+ 
+Index: yum-3.2.18/docs/Makefile
+===================================================================
+--- yum-3.2.18.orig/docs/Makefile       2008-08-23 09:19:07.000000000 +0100
+++ yum-3.2.18/docs/Makefile    2008-08-23 09:19:37.000000000 +0100
+@@ -6,9 +6,9 @@
+        rm -fr epydoc
+ 
+ install:
+-       mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
+-       install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
+-       install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
+-       install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
+-       install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
+-       install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
+       mkdir -p $(DESTDIR)$(mandir)/man{5,8}
+       install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8
+       install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8
+       install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
+       install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
+       install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5
+Index: yum-3.2.18/etc/Makefile
+===================================================================
+--- yum-3.2.18.orig/etc/Makefile        2008-08-23 09:19:51.000000000 +0100
+++ yum-3.2.18/etc/Makefile     2008-08-23 09:20:28.000000000 +0100
+@@ -5,20 +5,20 @@
+        rm -f *.pyc *.pyo *~
+ 
+ install:
+-       mkdir -p $(DESTDIR)/etc/yum/
+-       mkdir -p $(DESTDIR)/etc/yum/repos.d
+       mkdir -p $(DESTDIR)$(sysconfdir)/yum/
+       mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d
+ 
+-       install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
+       install -m 644 yum.conf $(DESTDIR)$(sysconfdir)/yum/yum.conf
+ 
+-       mkdir -p $(DESTDIR)/etc/logrotate.d
+-       install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
+       mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
+       install -m 644 yum.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/yum
+ 
+-       mkdir -p $(DESTDIR)/etc/rc.d/init.d
+-       install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd
+       mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
+       install -m 755 yum-updatesd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/yum-updatesd
+ 
+-       mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
+-       install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf
+       mkdir -p $(DESTDIR)$(sysconfdir)/dbus-1/system.d/
+       install -m 755 yum-updatesd-dbus.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/yum-updatesd.conf
+ 
+-       install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
+       install -m 755 yum-updatesd.conf $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf
+ 
+ 
diff --git a/meta/packages/yum/yum-native_3.2.18.bb b/meta/packages/yum/yum-native_3.2.18.bb
index 6657c52d80..d3098ccb91 100644
--- a/meta/packages/yum/yum-native_3.2.18.bb
+++ b/meta/packages/yum/yum-native_3.2.18.bb
@@ -1,6 +1,8 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
-SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz"
+SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
+           file://paths.patch;patch=1"
+PR = "r1"
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native"
author	Richard Purdie <richard@openedhand.com>	2008-08-26 11:03:13 +0000
committer	Richard Purdie <richard@openedhand.com>	2008-08-26 11:03:13 +0000
commit	38d187038e93f3fee6144737a8f49a34ef49d757 (patch)
tree	84fd5fc1134fe7b401f00a6f1222bae6f1bd528e
parent	020a00ab51ac278567b584fd5ed939919d4930ce (diff)
download	poky-38d187038e93f3fee6144737a8f49a34ef49d757.tar.gz

diff --git a/meta/packages/yum/yum-native/paths.patch b/meta/packages/yum/yum-native/paths.patch new file mode 100644 index 0000000000..ee5c999c4b --- /dev/null +++ b/meta/packages/yum/yum-native/paths.patch
@@ -0,0 +1,88 @@
		1	Index: yum-3.2.18/Makefile
		2	===================================================================
		3	--- yum-3.2.18.orig/Makefile 2008-08-23 09:13:56.000000000 +0100
		4	+++ yum-3.2.18/Makefile 2008-08-23 09:18:09.000000000 +0100
		5	@@ -18,19 +18,19 @@
		6	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] \|\| exit 1 ; done
		7
		8	install:
		9	- mkdir -p $(DESTDIR)/usr/share/yum-cli
		10	+ mkdir -p $(DESTDIR)$(datadir)/yum-cli
		11	for p in $(PYFILES) ; do \
		12	- install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \
		13	+ install -m 644 $$p $(DESTDIR)$(datadir)/yum-cli/$$p; \
		14	done
		15	- mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py $(DESTDIR)/usr/share/yum-cli/yumupd.py
		16	- $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
		17	+ mv $(DESTDIR)$(datadir)/yum-cli/yum-updatesd.py $(DESTDIR)$(datadir)/yum-cli/yumupd.py
		18	+ $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)$(datadir)/yum-cli', 1, '$(PYDIR)', 1)"
		19
		20	- mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
		21	- install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
		22	- install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
		23	+ mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
		24	+ install -m 755 bin/yum.py $(DESTDIR)$(bindir)/yum
		25	+ install -m 755 bin/yum-updatesd.py $(DESTDIR)$(sbindir)/yum-updatesd
		26
		27	- mkdir -p $(DESTDIR)/var/cache/yum
		28	- mkdir -p $(DESTDIR)/var/lib/yum
		29	+ mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
		30	+ mkdir -p $(DESTDIR)$(localstatedir)/lib/yum
		31
		32	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] \|\| exit 1; done
		33
		34	Index: yum-3.2.18/docs/Makefile
		35	===================================================================
		36	--- yum-3.2.18.orig/docs/Makefile 2008-08-23 09:19:07.000000000 +0100
		37	+++ yum-3.2.18/docs/Makefile 2008-08-23 09:19:37.000000000 +0100
		38	@@ -6,9 +6,9 @@
		39	rm -fr epydoc
		40
		41	install:
		42	- mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
		43	- install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
		44	- install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
		45	- install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
		46	- install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
		47	- install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
		48	+ mkdir -p $(DESTDIR)$(mandir)/man{5,8}
		49	+ install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8
		50	+ install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8
		51	+ install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
		52	+ install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
		53	+ install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5
		54	Index: yum-3.2.18/etc/Makefile
		55	===================================================================
		56	--- yum-3.2.18.orig/etc/Makefile 2008-08-23 09:19:51.000000000 +0100
		57	+++ yum-3.2.18/etc/Makefile 2008-08-23 09:20:28.000000000 +0100
		58	@@ -5,20 +5,20 @@
		59	rm -f .pyc .pyo *~
		60
		61	install:
		62	- mkdir -p $(DESTDIR)/etc/yum/
		63	- mkdir -p $(DESTDIR)/etc/yum/repos.d
		64	+ mkdir -p $(DESTDIR)$(sysconfdir)/yum/
		65	+ mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d
		66
		67	- install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
		68	+ install -m 644 yum.conf $(DESTDIR)$(sysconfdir)/yum/yum.conf
		69
		70	- mkdir -p $(DESTDIR)/etc/logrotate.d
		71	- install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
		72	+ mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
		73	+ install -m 644 yum.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/yum
		74
		75	- mkdir -p $(DESTDIR)/etc/rc.d/init.d
		76	- install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd
		77	+ mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
		78	+ install -m 755 yum-updatesd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/yum-updatesd
		79
		80	- mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
		81	- install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf
		82	+ mkdir -p $(DESTDIR)$(sysconfdir)/dbus-1/system.d/
		83	+ install -m 755 yum-updatesd-dbus.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/yum-updatesd.conf
		84
		85	- install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
		86	+ install -m 755 yum-updatesd.conf $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf
		87
		88


diff --git a/meta/packages/yum/yum-native_3.2.18.bb b/meta/packages/yum/yum-native_3.2.18.bb index 6657c52d80..d3098ccb91 100644 --- a/meta/packages/yum/yum-native_3.2.18.bb +++ b/meta/packages/yum/yum-native_3.2.18.bb
@@ -1,6 +1,8 @@
1	HOMEPAGE = "http://linux.duke.edu/projects/yum/"	1	HOMEPAGE = "http://linux.duke.edu/projects/yum/"
2		2
3	SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz"	3	SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
		4	file://paths.patch;patch=1"
		5	PR = "r1"
4		6
5	DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native"	7	DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native"
6		8