forked from pool/diskimage-builder
Accepting request 443936 from home:markoschandras:sysinstall
- Update to version 1.24.0
* elements: pip-and-virtualenv: Add python-xml dependency
* Trace package install in package-installs-v2
* elements: zypper-minimal: Add ca-certificates-mozilla package
* Improve checksum performance for images
* Perform package install outside of debootstrap
* Remove obsolete patches for the time being
- 0001-lib-Drop-shebang-from-library-scripts.patch
- 0002-elements-Drop-executable-bits-from-environment-files.patch
OBS-URL: https://build.opensuse.org/request/show/443936
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diskimage-builder?expand=0&rev=4
This commit is contained in:
Markos Chandras
committed by
Git OBS Bridge
Git OBS Bridge
parent
2c0b68cb3c
commit
2a6a055cbf
@@ -1,85 +0,0 @@
|
||||
From a61485fe0ccf31a8ef8fbcb115fa2b62002b4bff Mon Sep 17 00:00:00 2001
|
||||
From: Markos Chandras <mchandras@suse.de>
|
||||
Date: Mon, 17 Oct 2016 14:06:22 +0100
|
||||
Subject: [PATCH 1/2] lib: Drop shebang from library scripts
|
||||
|
||||
All scripts in lib/* are meant to be sourced instead of executed
|
||||
directly so drop the bash shebang.
|
||||
|
||||
Change-Id: I7b7e8fd390f5d57a558e092fe9548eacf6ce0bcf
|
||||
---
|
||||
lib/common-defaults | 1 -
|
||||
lib/common-functions | 1 -
|
||||
lib/die | 1 -
|
||||
lib/img-defaults | 1 -
|
||||
lib/img-functions | 1 -
|
||||
lib/ramdisk-defaults | 1 -
|
||||
lib/ramdisk-functions | 1 -
|
||||
7 files changed, 7 deletions(-)
|
||||
|
||||
diff --git a/lib/common-defaults b/lib/common-defaults
|
||||
index e047185..b846c6e 100644
|
||||
--- a/lib/common-defaults
|
||||
+++ b/lib/common-defaults
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
diff --git a/lib/common-functions b/lib/common-functions
|
||||
index 2545258..8cccead 100644
|
||||
--- a/lib/common-functions
|
||||
+++ b/lib/common-functions
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
diff --git a/lib/die b/lib/die
|
||||
index e2dde98..a949cdf 100644
|
||||
--- a/lib/die
|
||||
+++ b/lib/die
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
diff --git a/lib/img-defaults b/lib/img-defaults
|
||||
index 1bdf643..cf1893b 100644
|
||||
--- a/lib/img-defaults
|
||||
+++ b/lib/img-defaults
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
diff --git a/lib/img-functions b/lib/img-functions
|
||||
index f64a95a..4a3c940 100644
|
||||
--- a/lib/img-functions
|
||||
+++ b/lib/img-functions
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
diff --git a/lib/ramdisk-defaults b/lib/ramdisk-defaults
|
||||
index 2991ccb..13120f1 100644
|
||||
--- a/lib/ramdisk-defaults
|
||||
+++ b/lib/ramdisk-defaults
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# Copyright (c) 2012 NTT DOCOMO, INC.
|
||||
#
|
||||
diff --git a/lib/ramdisk-functions b/lib/ramdisk-functions
|
||||
index 6797114..7d8c245 100644
|
||||
--- a/lib/ramdisk-functions
|
||||
+++ b/lib/ramdisk-functions
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# Copyright (c) 2012 NTT DOCOMO, INC.
|
||||
#
|
||||
--
|
||||
2.10.1
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
From c9de1ed8c750ad8e91e7d1608ed609665cc426af Mon Sep 17 00:00:00 2001
|
||||
From: Markos Chandras <mchandras@suse.de>
|
||||
Date: Mon, 17 Oct 2016 14:16:55 +0100
|
||||
Subject: [PATCH 2/2] elements: Drop executable bits from environment files
|
||||
|
||||
Files in $element/environment.d are meant to be sourced, so drop
|
||||
the executable bit. Moreover, drop the executable bit from a couple
|
||||
of other scripts that are either meant to be sourced or simply because
|
||||
they are configuration files.
|
||||
|
||||
Change-Id: I7f724dd9d409f4a835a136f12f48a84aa9acc41e
|
||||
---
|
||||
elements/centos/environment.d/00-bootloader.bash | 2 --
|
||||
.../stable-build-succeeds/environment.d/10-set-distro.bash | 0
|
||||
.../testing-build-succeeds/environment.d/10-set-distro.bash | 0
|
||||
.../debian/test-elements/build-succeeds/environment.d/09-debian-stable | 0
|
||||
elements/devuser/environment.d/50-devuser | 0
|
||||
elements/dynamic-login/init-scripts/upstart/dynamic-login.conf | 0
|
||||
elements/gentoo/environment.d/00-gentoo-envars.bash | 0
|
||||
elements/manifests/environment.d/14-manifests | 1 -
|
||||
elements/pip-cache/environment.d/10-pip-cache | 0
|
||||
elements/ramdisk-base/extra-data.d/scripts/d/init-func | 0
|
||||
elements/redhat-common/environment.d/50-redhat-common | 0
|
||||
11 files changed, 3 deletions(-)
|
||||
mode change 100755 => 100644 elements/centos/environment.d/00-bootloader.bash
|
||||
mode change 100755 => 100644 elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash
|
||||
mode change 100755 => 100644 elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash
|
||||
mode change 100755 => 100644 elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable
|
||||
mode change 100755 => 100644 elements/devuser/environment.d/50-devuser
|
||||
mode change 100755 => 100644 elements/dynamic-login/init-scripts/upstart/dynamic-login.conf
|
||||
mode change 100755 => 100644 elements/gentoo/environment.d/00-gentoo-envars.bash
|
||||
mode change 100755 => 100644 elements/manifests/environment.d/14-manifests
|
||||
mode change 100755 => 100644 elements/pip-cache/environment.d/10-pip-cache
|
||||
mode change 100755 => 100644 elements/ramdisk-base/extra-data.d/scripts/d/init-func
|
||||
mode change 100755 => 100644 elements/redhat-common/environment.d/50-redhat-common
|
||||
|
||||
diff --git a/elements/centos/environment.d/00-bootloader.bash b/elements/centos/environment.d/00-bootloader.bash
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index 6478bc9..0df9a01
|
||||
--- a/elements/centos/environment.d/00-bootloader.bash
|
||||
+++ b/elements/centos/environment.d/00-bootloader.bash
|
||||
@@ -1,5 +1,3 @@
|
||||
-#!/bin/bash
|
||||
-
|
||||
if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
|
||||
set -x
|
||||
fi
|
||||
diff --git a/elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash b/elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash b/elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable b/elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/devuser/environment.d/50-devuser b/elements/devuser/environment.d/50-devuser
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/dynamic-login/init-scripts/upstart/dynamic-login.conf b/elements/dynamic-login/init-scripts/upstart/dynamic-login.conf
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/gentoo/environment.d/00-gentoo-envars.bash b/elements/gentoo/environment.d/00-gentoo-envars.bash
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/manifests/environment.d/14-manifests b/elements/manifests/environment.d/14-manifests
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index c2ae96d..78aeeb7
|
||||
--- a/elements/manifests/environment.d/14-manifests
|
||||
+++ b/elements/manifests/environment.d/14-manifests
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/bin/bash
|
||||
#
|
||||
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
diff --git a/elements/pip-cache/environment.d/10-pip-cache b/elements/pip-cache/environment.d/10-pip-cache
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/ramdisk-base/extra-data.d/scripts/d/init-func b/elements/ramdisk-base/extra-data.d/scripts/d/init-func
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/elements/redhat-common/environment.d/50-redhat-common b/elements/redhat-common/environment.d/50-redhat-common
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
--
|
||||
2.10.1
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f40f9f6c5b1ceebe10344d94ad9a87f56fa1724815c755f983198e9eb5de41d8
|
||||
size 248236
|
||||
3
diskimage-builder-1.24.0.tar.gz
Normal file
3
diskimage-builder-1.24.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e5236e0be1d07e0111bceae344bfe6f9dd8b0ed9eba64240e218ecc70b9a7b03
|
||||
size 256522
|
||||
@@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 5 15:24:49 UTC 2016 - mchandras@suse.de
|
||||
|
||||
- Update to version 1.24.0
|
||||
* elements: pip-and-virtualenv: Add python-xml dependency
|
||||
* Trace package install in package-installs-v2
|
||||
* elements: zypper-minimal: Add ca-certificates-mozilla package
|
||||
* Improve checksum performance for images
|
||||
* Perform package install outside of debootstrap
|
||||
* Remove obsolete patches for the time being
|
||||
- 0001-lib-Drop-shebang-from-library-scripts.patch
|
||||
- 0002-elements-Drop-executable-bits-from-environment-files.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 18 11:05:19 UTC 2016 - mchandras@suse.de
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
# are only ever run inside the disk image build chroot).
|
||||
%global __requires_exclude_from ^%{_datadir}/%{name}/elements/.*$
|
||||
Name: diskimage-builder
|
||||
Version: 1.21.0
|
||||
Version: 1.24.0
|
||||
Release: 0
|
||||
Summary: Image Building Tools for OpenStack
|
||||
License: Apache-2.0
|
||||
@@ -28,12 +28,6 @@ Group: Development/Languages/Python
|
||||
Url: https://github.com/openstack/diskimage-builder
|
||||
Source0: https://pypi.io/packages/source/d/%{name}/%{name}-%{version}.tar.gz
|
||||
Source99: diskimage-builder-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM: 0001-lib-Drop-shebang-from-library-scripts.patch
|
||||
# https://review.openstack.org/387440
|
||||
Patch0: 0001-lib-Drop-shebang-from-library-scripts.patch
|
||||
# PATCH-FIX-UPSTREAM: 0002-elements-Drop-executable-bits-from-environment-files.patch
|
||||
# https://review.openstack.org/387441
|
||||
Patch1: 0002-elements-Drop-executable-bits-from-environment-files.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-PyYAML
|
||||
BuildRequires: python-devel
|
||||
@@ -45,12 +39,12 @@ BuildRequires: python-setuptools
|
||||
BuildRequires: python-testrepository
|
||||
BuildRequires: python-testtools
|
||||
# No stuff in python_sitelib, thus autoreqprov won't work:
|
||||
Requires: python(abi) = %{py_ver}
|
||||
Requires: python-Babel >= 2.3.4
|
||||
Requires: python-PyYAML >= 3.1.0
|
||||
Requires: python-dib-utils
|
||||
Requires: python-six >= 1.9.0
|
||||
Requires: qemu-tools
|
||||
Requires: python(abi) = %{py_ver}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
@@ -61,8 +55,6 @@ building disk images.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%{__python2} setup.py build
|
||||
|
||||
Reference in New Issue
Block a user