#3 Update to 3.6.0
Merged 2 years ago by apevec. Opened 2 years ago by mhuin.
rpms/ mhuin/diskimage-builder f34_3.6  into  f34

file modified
+3
@@ -27,3 +27,6 @@ 

  /diskimage-builder-3.3.1.tar.gz

  /0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt

  /diskimage-builder-3.3.1.tar.gz.asc

+ /diskimage-builder-3.6.0.tar.gz

+ /diskimage-builder-3.6.0.tar.gz.asc

+ /0x5d2d1e4fb8d38e6af76c50d53d4fec30cf5ce3da.txt

@@ -0,0 +1,101 @@ 

+ From 643b2f3e662d6fda979858042df60afb4a5e5ddd Mon Sep 17 00:00:00 2001

+ From: Matthieu Huin <mhuin@redhat.com>

+ Date: Mon, 21 Jun 2021 16:37:09 +0200

+ Subject: [PATCH 1/1] Remove useless shebangs

+ 

+ ---

+  diskimage_builder/lib/common-defaults   | 1 -

+  diskimage_builder/lib/common-functions  | 1 -

+  diskimage_builder/lib/die               | 1 -

+  diskimage_builder/lib/disk-image-create | 1 -

+  diskimage_builder/lib/img-defaults      | 1 -

+  diskimage_builder/lib/img-functions     | 1 -

+  diskimage_builder/lib/outfilter.py      | 1 -

+  diskimage_builder/lib/ramdisk-defaults  | 1 -

+  diskimage_builder/lib/ramdisk-functions | 1 -

+  9 files changed, 9 deletions(-)

+ 

+ diff --git a/diskimage_builder/lib/common-defaults b/diskimage_builder/lib/common-defaults

+ index 7370e5e3..28fade38 100644

+ --- a/diskimage_builder/lib/common-defaults

+ +++ b/diskimage_builder/lib/common-defaults

+ @@ -1,4 +1,3 @@

+ -#!/bin/bash

+  # Copyright 2012 Hewlett-Packard Development Company, L.P.

+  # All Rights Reserved.

+  #

+ diff --git a/diskimage_builder/lib/common-functions b/diskimage_builder/lib/common-functions

+ index daeb360a..f7000ad1 100644

+ --- a/diskimage_builder/lib/common-functions

+ +++ b/diskimage_builder/lib/common-functions

+ @@ -1,4 +1,3 @@

+ -#!/bin/bash

+  # Copyright 2012 Hewlett-Packard Development Company, L.P.

+  # All Rights Reserved.

+  #

+ diff --git a/diskimage_builder/lib/die b/diskimage_builder/lib/die

+ index e2dde986..a949cdfd 100644

+ --- a/diskimage_builder/lib/die

+ +++ b/diskimage_builder/lib/die

+ @@ -1,4 +1,3 @@

+ -#!/bin/bash

+  # Copyright 2012 Hewlett-Packard Development Company, L.P.

+  # All Rights Reserved.

+  #

+ diff --git a/diskimage_builder/lib/disk-image-create b/diskimage_builder/lib/disk-image-create

+ index fac8c61c..8d9f5ce3 100644

+ --- a/diskimage_builder/lib/disk-image-create

+ +++ b/diskimage_builder/lib/disk-image-create

+ @@ -1,4 +1,3 @@

+ -#!/bin/bash

+  #

+  # Copyright 2012 Hewlett-Packard Development Company, L.P.

+  #

+ diff --git a/diskimage_builder/lib/img-defaults b/diskimage_builder/lib/img-defaults

+ index 1bdf6431..cf1893b1 100644

+ --- a/diskimage_builder/lib/img-defaults

+ +++ b/diskimage_builder/lib/img-defaults

+ @@ -1,4 +1,3 @@

+ -#!/bin/bash

+  # Copyright 2012 Hewlett-Packard Development Company, L.P.

+  # All Rights Reserved.

+  #

+ diff --git a/diskimage_builder/lib/img-functions b/diskimage_builder/lib/img-functions

+ index a41331bb..7a5190f8 100644

+ --- a/diskimage_builder/lib/img-functions

+ +++ b/diskimage_builder/lib/img-functions

+ @@ -1,4 +1,3 @@

+ -#!/bin/bash

+  # Copyright 2012 Hewlett-Packard Development Company, L.P.

+  # All Rights Reserved.

+  #

+ diff --git a/diskimage_builder/lib/outfilter.py b/diskimage_builder/lib/outfilter.py

+ index 450d7dbc..35583f7d 100644

+ --- a/diskimage_builder/lib/outfilter.py

+ +++ b/diskimage_builder/lib/outfilter.py

+ @@ -1,4 +1,3 @@

+ -#!/usr/bin/env python3

+  #

+  # Copyright 2014 Hewlett-Packard Development Company, L.P.

+  #

+ diff --git a/diskimage_builder/lib/ramdisk-defaults b/diskimage_builder/lib/ramdisk-defaults

+ index 2991ccbb..13120f1d 100644

+ --- a/diskimage_builder/lib/ramdisk-defaults

+ +++ b/diskimage_builder/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/diskimage_builder/lib/ramdisk-functions b/diskimage_builder/lib/ramdisk-functions

+ index 68bea839..62639cfd 100644

+ --- a/diskimage_builder/lib/ramdisk-functions

+ +++ b/diskimage_builder/lib/ramdisk-functions

+ @@ -1,4 +1,3 @@

+ -#!/bin/bash

+  # Copyright 2012 Hewlett-Packard Development Company, L.P.

+  # Copyright (c) 2012 NTT DOCOMO, INC.

+  #

+ -- 

+ 2.31.1

+ 

file modified
+16 -3
@@ -1,11 +1,11 @@ 

  %{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} }

- %global sources_gpg_sign 0x2426b928085a020d8a90d0d879ab7008d0896c8a

+ %global sources_gpg_sign 0x5d2d1e4fb8d38e6af76c50d53d4fec30cf5ce3da

  

  %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

  Name:           diskimage-builder

  Summary:        Image building tools for OpenStack

- Version:        3.3.1

- Release:        3%{?dist}

+ Version:        3.6.0

+ Release:        1%{?dist}

  License:        ASL 2.0

  Group:          System Environment/Base

  URL:            https://launchpad.net/diskimage-builder
@@ -15,6 +15,9 @@ 

  Source101:        https://tarballs.openstack.org/diskimage-builder/%{name}-%{upstream_version}.tar.gz.asc

  Source102:        https://releases.openstack.org/_static/%{sources_gpg_sign}.txt

  %endif

+ 

+ Patch01:        0001-Remove-useless-shebangs.patch

+ 

  AutoReqProv: no

  

  BuildArch: noarch
@@ -75,6 +78,9 @@ 

  # explicitly remove config-applier since it does a pip install

  rm -rf %{buildroot}%{_datadir}/%{name}/elements/config-applier

  

+ # remove zero-length files

+ find %{buildroot} -size 0 -delete

+ 

  # This file is being split out of diskimage-builder, so remove it to

  # avoid conflicts with the new package.

  rm -f %{buildroot}%{_bindir}/dib-run-parts
@@ -91,6 +97,10 @@ 

  pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitelib}/diskimage_builder/elements/svc-map/extra-data.d/10-merge-svc-map-files

  pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitelib}/diskimage_builder/elements/svc-map/bin/svc-map

  

+ # remove symlink, just plain-copy script to avoid non-executable-script error in rpmlint

+ rm %{buildroot}%{python3_sitelib}/diskimage_builder/lib/ramdisk-image-create

+ cp %{buildroot}%{python3_sitelib}/diskimage_builder/lib/disk-image-create %{buildroot}%{python3_sitelib}/diskimage_builder/lib/ramdisk-image-create

+ 

  %description

  Components of TripleO that are responsible for building disk images.

  
@@ -102,6 +112,9 @@ 

  %{_datadir}/%{name}/elements

  

  %changelog

+ * Mon Jun 21 2021 Matthieu Huin <mhuin@redhat.com> 3.6.0-1

+ - Update to upstream version 3.6.0

+ 

  * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

  

file modified
+3 -3
@@ -1,3 +1,3 @@ 

- SHA512 (diskimage-builder-3.3.1.tar.gz) = 095c0968f5ceeb220c3871ccd14c7bf7c1b3d883bcb02f9cfe7406d5a336c36a813c8290bf133441a2a59972f485596aa5620b755016aba348afe3b7fc723c9f

- SHA512 (0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt) = b7e6d9d398c3d0a825919714e15a4165aecc19107ca04a8e9435f5ce3b57d87255154d2c9a0bc83798580385e62e7b0cd57d8b0e7cb92950371ee36e31759cee

- SHA512 (diskimage-builder-3.3.1.tar.gz.asc) = cf3624420dbff80fccbd872c45fa09428090f7b71dffd710debfa39f58b93f255accfe0adb1cb194f693a81352fb05e54eaa58be1450d8a18dd4bc19f247776e

+ SHA512 (0x5d2d1e4fb8d38e6af76c50d53d4fec30cf5ce3da.txt) = de05d453914290e5a002d1202baa74d02f57f1b48a77f438b4bc0cc70d00ca4a8a022ed8c0d8c0cea54804eca564ade447cc70c30b8639464115aaf948285fdf

+ SHA512 (diskimage-builder-3.6.0.tar.gz) = c50c8429962f3382fa9b461498e6960385e944edbdb2d4175b7a96b637325e0ec2ecbcdf846a3facef35ac1c07bc90ca2d1ffc468f3ba0b156a974567795ee9e

+ SHA512 (diskimage-builder-3.6.0.tar.gz.asc) = 13110ce98893565e5810fd4803d635282a952aca33c9324ddec06f01a02641427ab048f6dfad9a2dcc01cbfbc948bdfd8e071b85e53b17b5f1b8341057ab8b39

no initial comment

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

1 new commit added

  • Update GPG key
2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

1 new commit added

  • Fix sources
2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

1 new commit added

  • Fix linter errors
2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

1 new commit added

  • Remove faulty symlink, copy script instead
2 years ago

1 new commit added

  • Provide python3-diskimage-builder
2 years ago

Build succeeded.

1 new commit added

  • Remove useless provides
2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Build succeeded.

Pull-Request has been merged by apevec

2 years ago