v17.2-2

3 files changed, 19 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c81c378e8685..002a42d1b9e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cloud-init
 	pkgdesc = The standard for customising cloud instances
 	pkgver = 17.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cloud-init.io
 	arch = any
 	license = GPL3
@@ -25,10 +25,12 @@ pkgbase = cloud-init
 	backup = etc/cloud/cloud.cfg.d/05_logging.cfg
 	source = https://launchpad.net/cloud-init/trunk/17.2/+download/cloud-init-17.2.tar.gz
 	source = fix-logging.patch
+	source = fix-lib.patch
 	source = archlinux.cloud.cfg
 	sha256sums = f00338767a8877c8d72fe64a78d3897da822b3c1f47779ae31adc4815275594f
 	sha256sums = 0c1d5976eda3a74c4c3b78701ea1109f3a3022df7a623359154924b67e64d356
-	sha256sums = b1823e8b0eb645807aa8d5a3ef56d2c9bdff2bc188570947fffc9be74e66368d
+	sha256sums = 0ace6a9e4156145e5b50bd5fa75d6aeefe8e5c10a63f8d9e0d3c7be4c9b53942
+	sha256sums = 344531c5e7c19e540c2381f19ee87807a1d478a21a24d7e143429479efd5de49
 
 pkgname = cloud-init
 
diff --git a/PKGBUILD b/PKGBUILD
index 6dbc3280db18..619ee08fbf49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cloud-init
 pkgver=17.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The standard for customising cloud instances"
 arch=('any')
 url="https://cloud-init.io"
@@ -18,15 +18,18 @@ makedepends=('python2' 'python2-setuptools')
 backup=('etc/cloud/cloud.cfg' 'etc/cloud/cloud.cfg.d/05_logging.cfg')
 source=("https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz"
         fix-logging.patch
+        fix-lib.patch
         archlinux.cloud.cfg)
 sha256sums=('f00338767a8877c8d72fe64a78d3897da822b3c1f47779ae31adc4815275594f'
             '0c1d5976eda3a74c4c3b78701ea1109f3a3022df7a623359154924b67e64d356'
+            '0ace6a9e4156145e5b50bd5fa75d6aeefe8e5c10a63f8d9e0d3c7be4c9b53942'
             '344531c5e7c19e540c2381f19ee87807a1d478a21a24d7e143429479efd5de49')
 
 prepare(){
   cd $pkgname-$pkgver
 
   patch -Np1 -i ../fix-logging.patch
+  patch -Np1 -i ../fix-lib.patch
 
   find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
   sed -i '1s/python$/&2/' tools/read*
diff --git a/fix-lib.patch b/fix-lib.patch
new file mode 100644
index 000000000000..e90d33d056d2
--- /dev/null
+++ b/fix-lib.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -151,7 +151,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
+ USR = "usr"
+ ETC = "etc"
+ USR_LIB_EXEC = "usr/lib"
+-LIB = "lib"
++LIB = "usr/lib"
+ if os.uname()[0] == 'FreeBSD':
+     USR = "usr/local"
+     USR_LIB_EXEC = "usr/local/lib"