diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-02 14:26:24 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-02 14:26:24 +0000 |
commit | 94fa2b90c53ced5d6b720a57edcd290123d812d2 (patch) | |
tree | ab95598ac4bc64a9121c74598117060dd8083f46 /meta/packages/yum/files | |
parent | 8626cf563c9b0b46f0e04de09250fc5cc1be816d (diff) | |
download | openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.tar.gz openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.tar.bz2 openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.tar.xz openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.zip |
yum: added 3.2.18
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5379 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/yum/files')
-rw-r--r-- | meta/packages/yum/files/extract-postinst.awk | 11 | ||||
-rw-r--r-- | meta/packages/yum/files/hacks.patch | 72 | ||||
-rw-r--r-- | meta/packages/yum/files/paths.patch | 88 | ||||
-rwxr-xr-x | meta/packages/yum/files/yum-install-recommends.py | 39 |
4 files changed, 210 insertions, 0 deletions
diff --git a/meta/packages/yum/files/extract-postinst.awk b/meta/packages/yum/files/extract-postinst.awk new file mode 100644 index 000000000..8f2836b32 --- /dev/null +++ b/meta/packages/yum/files/extract-postinst.awk @@ -0,0 +1,11 @@ +/Name:.*/ { + package = substr($0, 7) + next +} +/postinstall.*scriptlet .*/ { + next +} +{ + print $0 >> ENVIRON["D"] "/etc/rpm-postinsts/" package ".sh" +} + diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch new file mode 100644 index 000000000..d0232ec9b --- /dev/null +++ b/meta/packages/yum/files/hacks.patch @@ -0,0 +1,72 @@ +--- + rpmUtils/arch.py | 3 +++ + rpmUtils/transaction.py | 1 + + yum/constants.py | 2 +- + yum/depsolve.py | 2 ++ + 4 files changed, 7 insertions(+), 1 deletion(-) + +Index: yum-3.2.18/rpmUtils/arch.py +=================================================================== +--- yum-3.2.18.orig/rpmUtils/arch.py 2008-06-17 14:05:42.000000000 +0100 ++++ yum-3.2.18/rpmUtils/arch.py 2008-09-01 15:47:11.000000000 +0100 +@@ -275,6 +275,7 @@ + return arch + + def getCanonArch(skipRpmPlatform = 0): ++ return "arm" + if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK): + try: + f = open("/etc/rpm/platform", "r") +@@ -331,6 +332,8 @@ + base arch is the arch before noarch in the arches dict if myarch is not + a key in the multilibArches.""" + ++ return "arm" ++ + if not myarch: + myarch = canonArch + +Index: yum-3.2.18/rpmUtils/transaction.py +=================================================================== +--- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100 ++++ yum-3.2.18/rpmUtils/transaction.py 2008-09-03 17:55:27.000000000 +0100 +@@ -43,6 +43,7 @@ + 'clean'] + self.tsflags = [] + self.open = True ++ self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS | rpm.RPMPROB_FILTER_IGNOREARCH) + + def __del__(self): + # Automatically close the rpm transaction when the reference is lost +Index: yum-3.2.18/yum/constants.py +=================================================================== +--- yum-3.2.18.orig/yum/constants.py 2008-07-21 16:56:54.000000000 +0100 ++++ yum-3.2.18/yum/constants.py 2008-09-01 15:47:11.000000000 +0100 +@@ -17,7 +17,7 @@ + """ + + #Constants +-YUM_PID_FILE = '/var/run/yum.pid' ++YUM_PID_FILE = '/var/run2/yum.pid' + + #transaction set states + TS_UPDATE = 10 +Index: yum-3.2.18/yum/depsolve.py +=================================================================== +--- yum-3.2.18.orig/yum/depsolve.py 2008-08-06 17:05:16.000000000 +0100 ++++ yum-3.2.18/yum/depsolve.py 2008-09-03 21:05:52.000000000 +0100 +@@ -141,9 +141,14 @@ + else: + self.logger.critical(_('Invalid tsflag in config file: %s'), flag) + ++ self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOPOST) ++ self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOTRIGGERS) ++ + probfilter = 0 + for flag in self.tsInfo.probFilterFlags: + probfilter |= flag ++ probfilter |= rpm.RPMPROB_FILTER_IGNOREOS ++ probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH + self._ts.setProbFilter(probfilter) + + def whatProvides(self, name, flags, version): diff --git a/meta/packages/yum/files/paths.patch b/meta/packages/yum/files/paths.patch new file mode 100644 index 000000000..ee5c999c4 --- /dev/null +++ b/meta/packages/yum/files/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/files/yum-install-recommends.py b/meta/packages/yum/files/yum-install-recommends.py new file mode 100755 index 000000000..64716f2c3 --- /dev/null +++ b/meta/packages/yum/files/yum-install-recommends.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python +import os, sys + +root = sys.argv[1] +installcmd = sys.argv[2] + +# +# Take an rpm image and look through for Recommends:. For each recommends +# found, try and install any matching packages including any Recommends for +# packages installed by us. +# + + +def get_recommends(): + deps = [] + output = os.popen("rpm --root %s -aq --recommends" % (root)) + lines = output.readlines() + for line in lines: + line = line.replace("(none)","") + if line: + deps.append(line.split()[0]) + return deps + +processed = [] + +while True: + toinstall = [] + recommends = set(get_recommends()) + for item in recommends: + if item not in processed: + toinstall.append(item) + if len(toinstall) != 0: + print "Installing %s" % " ".join(toinstall) + os.system("%s %s" % (installcmd, " ".join(toinstall))) + else: + break + processed.extend(toinstall) + + |