diff options
| -rw-r--r-- | dev-util/catalyst/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/catalyst/catalyst-2.0.6.914.ebuild | 1 | ||||
| -rw-r--r-- | dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch | 37 |
3 files changed, 40 insertions, 1 deletions
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index a021da8..eb90567 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,4 +1,5 @@ +AUX 0001-generic_stage_target.py-stupify-the-LockDir-call.patch 1542 RMD160 4ee07876c3db4331676e52744c27d4dc3f5246b8 SHA1 590b525afd59ec6e2254fd5610dec2d0d03f492d SHA256 ec74c54f8553072f10f6a88162c4a70889dadc341b279158e49a6f9b9a5e7987 DIST catalyst-2.0.6.914.tar.bz2 819758 RMD160 5b4bd8fd35b61a0c1a6c853fca63c7248d2d1f71 SHA1 c4fa97d7c3469c93e38ab83c8f8056cff3a54cf1 SHA256 c20b3d61328807cdd93e5e4e535998f938f1b3fd597eeaec597ab799f2baa7e8 -EBUILD catalyst-2.0.6.914.ebuild 2446 RMD160 93f35cb0b85693307d8b788df1ae8a063a33c710 SHA1 164f86e74e9b55578edca377620b78efd0c9d666 SHA256 006da89da9e256798f9d072478b55ffa8fe275ea3e13e2c29deed61a992b70d1 +EBUILD catalyst-2.0.6.914.ebuild 2480 RMD160 2cc5b500e6a5bccd66afaac17fe6d58ad3895e35 SHA1 30e8466c35f2d932536083f4c4a4fcb38cb58532 SHA256 4649e003fee3222b9a6245c6d86f0ae84bdf3d5290f59508303deab28ca36c8b MISC ChangeLog 47583 RMD160 d67b764b3126c6a8f51b2433ccb2bb20c0694313 SHA1 cc3a22de9230a3d05cb3f79aca3f651f83839a7e SHA256 0c6e28f146d8c0f433239e37ff946d3701dfe5fda19ee7338b955dfbc8382605 MISC metadata.xml 302 RMD160 963f1d00b35f824f4ebb4ecbe565b5d9603ee3ee SHA1 61841e2ff22153be6bd9cb5cacc34fbb6f391b37 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 diff --git a/dev-util/catalyst/catalyst-2.0.6.914.ebuild b/dev-util/catalyst/catalyst-2.0.6.914.ebuild index 0ae3e63..40ccc18 100644 --- a/dev-util/catalyst/catalyst-2.0.6.914.ebuild +++ b/dev-util/catalyst/catalyst-2.0.6.914.ebuild @@ -43,6 +43,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/0001*.patch } src_install() { diff --git a/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch b/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch new file mode 100644 index 0000000..cfa3980 --- /dev/null +++ b/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch @@ -0,0 +1,37 @@ +From 9e011d21cc7f90025e5e37c2b801f25c3a7c63ca Mon Sep 17 00:00:00 2001 +From: Jeremy Olexa <darkside@gentoo.org> +Date: Wed, 6 Apr 2011 22:06:20 -0500 +Subject: [PATCH] generic_stage_target.py: stupify the LockDir call + +This is a terrible hack to make catalyst work on networked file systems. +I don't expect this to be upstreamed and it will probably break stuff if +there is more than one instance of catalyst running. +--- + modules/generic_stage_target.py | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py +index 55baea7..7a7ce0a 100644 +--- a/modules/generic_stage_target.py ++++ b/modules/generic_stage_target.py +@@ -420,7 +420,7 @@ class generic_stage_target(generic_target): + normpath(self.settings["snapshot_cache"]+"/"+\ + self.settings["snapshot"]+"/") + self.snapcache_lock=\ +- catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) ++ catalyst_lock.LockDir(self.settings["/tmp"]) + print "Caching snapshot to "+self.settings["snapshot_cache_path"] + + def set_chroot_path(self): +@@ -430,7 +430,7 @@ class generic_stage_target(generic_target): + """ + self.settings["chroot_path"]=normpath(self.settings["storedir"]+\ + "/tmp/"+self.settings["target_subpath"]+"/") +- self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"]) ++ self.chroot_lock=catalyst_lock.LockDir(self.settings["/opt"]) + + def set_autoresume_path(self): + self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\ +-- +1.7.4.1 + |