[ARVADOS] updated: 7ca887a10c55b7fe9400bd3c536e721115a28a6e

git at public.curoverse.com git at public.curoverse.com
Wed Sep 2 09:52:34 EDT 2015


Summary of changes:
 backports/python-ciso8601/fpm-info.sh |   8 ++
 backports/python-llfuse/fpm-info.sh   |   4 +-
 backports/python-pycrypto/fpm-info.sh |  11 +++
 backports/python-pycurl/fpm-info.sh   | 136 ++++++++++++++++++++++++++++++++--
 sdk/python/fpm-info.sh                |   8 --
 5 files changed, 151 insertions(+), 16 deletions(-)
 create mode 100644 backports/python-ciso8601/fpm-info.sh
 create mode 100644 backports/python-pycrypto/fpm-info.sh
 delete mode 100644 sdk/python/fpm-info.sh

       via  7ca887a10c55b7fe9400bd3c536e721115a28a6e (commit)
       via  041e4e800f83d0bb7f86f59e0a2858a744899825 (commit)
       via  e88a8ceda8cbc3dfb35b6207cd26d08449dd7d18 (commit)
      from  316528db7406bd6986da89fdbfc01688dcb1ad4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7ca887a10c55b7fe9400bd3c536e721115a28a6e
Merge: 316528d 041e4e8
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Sep 2 09:52:06 2015 -0400

    Merge branch '6638-python-backport-dependencies-wip'
    
    Closes #6638.


commit 041e4e800f83d0bb7f86f59e0a2858a744899825
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Aug 26 10:49:41 2015 -0400

    6638: Remove C dependencies from our Python SDK.
    
    Now that our backports properly declare their C dependencies, they're
    no longer needed here.

diff --git a/sdk/python/fpm-info.sh b/sdk/python/fpm-info.sh
deleted file mode 100644
index 71e9521..0000000
--- a/sdk/python/fpm-info.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-case "$TARGET" in
-    debian* | ubuntu*)
-        fpm_depends+=('libcurl4-gnutls-dev | libcurl4-openssl-dev' 'libyaml-dev')
-        ;;
-    centos*)
-        fpm_depends+=('libcurl' 'libyaml')
-        ;;
-esac

commit e88a8ceda8cbc3dfb35b6207cd26d08449dd7d18
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Aug 26 10:49:14 2015 -0400

    6638: Python backports declare all their C dependencies.
    
    See #6638 for discussion about how these dependency lists were
    generated.

diff --git a/backports/python-ciso8601/fpm-info.sh b/backports/python-ciso8601/fpm-info.sh
new file mode 100644
index 0000000..925a375
--- /dev/null
+++ b/backports/python-ciso8601/fpm-info.sh
@@ -0,0 +1,8 @@
+case "$TARGET" in
+    centos*)
+        fpm_depends+=(glibc)
+        ;;
+    debian* | ubuntu*)
+        fpm_depends+=(libc6)
+        ;;
+esac
diff --git a/backports/python-llfuse/fpm-info.sh b/backports/python-llfuse/fpm-info.sh
index ecde128..c578365 100644
--- a/backports/python-llfuse/fpm-info.sh
+++ b/backports/python-llfuse/fpm-info.sh
@@ -1,10 +1,10 @@
 case "$TARGET" in
     centos*)
         build_depends+=('fuse-devel')
-        fpm_depends+=('fuse')
+        fpm_depends+=(glibc fuse-libs)
         ;;
     debian* | ubuntu*)
         build_depends+=('libfuse-dev')
-        fpm_depends+=('fuse')
+        fpm_depends+=(libc6 libfuse2)
         ;;
 esac
diff --git a/backports/python-pycrypto/fpm-info.sh b/backports/python-pycrypto/fpm-info.sh
new file mode 100644
index 0000000..cea7096
--- /dev/null
+++ b/backports/python-pycrypto/fpm-info.sh
@@ -0,0 +1,11 @@
+case "$TARGET" in
+    centos*)
+        fpm_depends+=(glibc)
+        ;;
+    debian8)
+        fpm_depends+=(libc6 libgmp10)
+        ;;
+    debian* | ubuntu*)
+        fpm_depends+=(libc6)
+        ;;
+esac
diff --git a/backports/python-pycurl/fpm-info.sh b/backports/python-pycurl/fpm-info.sh
index a72f927..4d2860f 100644
--- a/backports/python-pycurl/fpm-info.sh
+++ b/backports/python-pycurl/fpm-info.sh
@@ -1,8 +1,132 @@
 case "$TARGET" in
-    debian* | ubuntu*)
-        fpm_depends+=('libcurl4-gnutls-dev | libcurl4-openssl-dev')
-        ;;
-    centos*)
-        fpm_depends+=('libcurl')
-        ;;
+    centos6)
+            fpm_depends+=(
+                cyrus-sasl-lib
+                glibc
+                keyutils-libs
+                krb5-libs
+                libcom_err
+                libcurl
+                libidn
+                libselinux
+                libssh2
+                nspr
+                nss
+                nss-softokn-freebl
+                nss-util
+                openldap
+                openssl
+                zlib
+            ) ;;
+    debian7)
+            fpm_depends+=(
+                libc6
+                libcomerr2
+                libcurl3-gnutls
+                libgcrypt11
+                libgnutls26
+                libgpg-error0
+                libgssapi-krb5-2
+                libidn11
+                libk5crypto3
+                libkeyutils1
+                libkrb5-3
+                libkrb5support0
+                libldap-2.4-2
+                libp11-kit0
+                librtmp0
+                libsasl2-2
+                libssh2-1
+                libtasn1-3
+                zlib1g
+            ) ;;
+    debian8)
+            fpm_depends+=(
+                libc6
+                libcomerr2
+                libcurl3-gnutls
+                libffi6
+                libgcrypt20
+                libgmp10
+                libgnutls-deb0-28
+                libgpg-error0
+                libgssapi-krb5-2
+                libhogweed2
+                libidn11
+                libk5crypto3
+                libkeyutils1
+                libkrb5-3
+                libkrb5support0
+                libldap-2.4-2
+                libnettle4
+                libp11-kit0
+                librtmp1
+                libsasl2-2
+                libssh2-1
+                libtasn1-6
+                zlib1g
+            ) ;;
+    ubuntu1204)
+            fpm_depends+=(
+                libasn1-8-heimdal
+                libc6
+                libcomerr2
+                libcurl3-gnutls
+                libgcrypt11
+                libgnutls26
+                libgpg-error0
+                libgssapi-krb5-2
+                libgssapi3-heimdal
+                libhcrypto4-heimdal
+                libheimbase1-heimdal
+                libheimntlm0-heimdal
+                libhx509-5-heimdal
+                libidn11
+                libk5crypto3
+                libkeyutils1
+                libkrb5-26-heimdal
+                libkrb5-3
+                libkrb5support0
+                libldap-2.4-2
+                libp11-kit0
+                libroken18-heimdal
+                librtmp0
+                libsasl2-2
+                libsqlite3-0
+                libtasn1-3
+                libwind0-heimdal
+                zlib1g
+            ) ;;
+    ubuntu1404)
+            fpm_depends+=(
+                libasn1-8-heimdal
+                libc6
+                libcomerr2
+                libcurl3-gnutls
+                libffi6
+                libgcrypt11
+                libgnutls26
+                libgpg-error0
+                libgssapi-krb5-2
+                libgssapi3-heimdal
+                libhcrypto4-heimdal
+                libheimbase1-heimdal
+                libheimntlm0-heimdal
+                libhx509-5-heimdal
+                libidn11
+                libk5crypto3
+                libkeyutils1
+                libkrb5-26-heimdal
+                libkrb5-3
+                libkrb5support0
+                libldap-2.4-2
+                libp11-kit0
+                libroken18-heimdal
+                librtmp0
+                libsasl2-2
+                libsqlite3-0
+                libtasn1-6
+                libwind0-heimdal
+                zlib1g
+            ) ;;
 esac

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list