diff --git a/component/condor/buildout.cfg b/component/condor/buildout.cfg index b2ada0492a3a67d368b89d23e6796238d7869c9c..a57ecb20d8cfb523c0c6bffbbfdbc0b1d70017ee 100644 --- a/component/condor/buildout.cfg +++ b/component/condor/buildout.cfg @@ -2,13 +2,6 @@ parts = condor - libexpat - kerberos - perl - openldap - java - dash - zlib extends = ../libexpat/buildout.cfg @@ -19,9 +12,35 @@ extends = ../dash/buildout.cfg ../zlib/buildout.cfg ../../stack/slapos.cfg - + [condor] -recipe = hexagonit.recipe.download -url = https://doc-0c-60-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/5sp63u5v03ie9nu49dfodreb2dcomstb/1369231200000/01656987990562299665/*/0B9HYL8A0vSryTTIxX29rM0N6N28?e=download -md5sum = e7d96746fc9102ca4583f8cd5eb472e0 -strip-top-level-dir = true +recipe = slapos.recipe.build +slapos_promise = + directory:bin + directory:etc + directory:examples + directory:include + directory:lib + directory:libexec + directory:man + directory:src + directory:sbin + +depends = + ${libexpat:location} + ${kerberos:location} + ${perl:location} + ${openldap:location} + ${java:location} + ${dash:location} + ${zlib:location} + +x86 = http://parrot.cs.wisc.edu//symlink/20130530031504/7/7.9/7.9.5/28b36a94ad1a405bac689a76b6c353a7/condor-7.9.5-x86_Debian6-unstripped.tar.gz 227059bb9bebc9033665bb246d90a7bb +x86-64 = http://parrot.cs.wisc.edu//symlink/20130530031504/7/7.9/7.9.5/7000a12f9a22765b457e2958762871d5/condor-7.9.5-x86_64_Debian6-stripped.tar.gz 30fa4cebabb8ff4971c769f4ef74ba68 + +script = + if not self.options.get('path'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ') + extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum'))) + workdir = guessworkdir(extract_dir) + self.copyTree(workdir, "%(location)s") + \ No newline at end of file diff --git a/software/condor/software.cfg b/software/condor/software.cfg index 257903910cb23f98bd2341bde83d3d6bc95d60e6..d295e2d8c7378f563c7d3c7eaf33a658fe26d877 100644 --- a/software/condor/software.cfg +++ b/software/condor/software.cfg @@ -67,9 +67,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link [networkcache] -# Romain Courteaud + Sebastien Robin + Alain Takoudjou -# + Cedric de Saint Martin signature certificate -# List of signatures of uploaders we trust: +# signature certificates of the following uploaders. # Romain Courteaud # Sebastien Robin # Kazuhiko Shiozaki @@ -77,7 +75,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link # Yingjie Xu # Gabriel Monnerat # 脜聛ukasz Nowak -# Test Agent Signature +# Test Agent (Automatic update from tests) # Alain Takoudjou signature-certificate-list = -----BEGIN CERTIFICATE----- @@ -185,17 +183,17 @@ signature-certificate-list = x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- - MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV - BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER - MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR - T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5 - psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN - NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW - BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk - C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke - LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss - dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2 - n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR + MIIB8jCCAVugAwIBAgIJANlTfgX/9cX7MA0GCSqGSIb3DQEBBQUAMBExDzANBgNV + BAMMBkNPTVAtMDAgFw0xMzA1MzAxMTUyMDhaGA8yMTEzMDUwNjExNTIwOFowETEP + MA0GA1UEAwwGQ09NUC0wMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSGtkh + UPOcYMRiL2czmdfeHNB34nXEr5fMpglbA9RO9Cakf6YhK0jU5Y7kzAb6ZlyEzcC+ + YkYWQZ9WCLwGuUvThg5iYlnBxmksv5Ot+5DKyTL4hdMEPCQ0RaLcXSkbxk56q3Rn + EQdYL+IJXS1KGMRWbl4Ql3NhShM9q7vBgyoMuwIDAQABo1AwTjAdBgNVHQ4EFgQU + EpO2oyW/sFAS9eojDbYo3hEOOIIwHwYDVR0jBBgwFoAUEpO2oyW/sFAS9eojDbYo + 3hEOOIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBP02wmekqmeD23 + 90NmwDwyEznDPEJDJybREtP+T++EJ1Q/rcnxIQ5a1iOEWY4RdH87H/+2O/7nDzGs + L0KzeG3WDdmnxLMQ5zpG9Qd5twC0GoMl1zf+8f9/t4QE7Dn4IosP3H3dkcRDQRch + SKYaJZHMckKx40/hhRsyFDR1Gj215g== -----END CERTIFICATE----- [versions]