pool/product-builder
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 614497 from openSUSE:Tools

Browse Source 
- 1.1.3
  * Another fix needed for hybrid media on x86_64

- 1.1.2
  * Do not generate Apple partion on ppc64le anymore
  * Allow to build medias without meta packages again

- 1.1.1
  * fix EFI boot sort order
- drop factory skelcd hack (accept_old_meta_package.patch)

- 1.1.0
  * fixed handling of metapackages with multiple lines for one package
    filtered via required architecture
  * execute mk_listings when configured (bsc#1094929)
  + drop promo / live boot code
  * Add riscv64 architecture

OBS-URL: https://build.opensuse.org/request/show/614497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/product-builder?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2018-06-08 21:20:04 +00:00 committed by Git OBS Bridge
commit 3796767a33
7 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -1,8 +1,8 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/openSUSE/product-builder.git</param>
<param name="revision">1.0.9</param>
<param name="version">1.0.9</param>
<param name="revision">1.1.3</param>
<param name="version">1.1.3</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>

12
accept_old_meta_package.patch
View File

@ -1,12 +0,0 @@
diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm
index b3e6357..f99ca8b 100644
--- a/modules/KIWICollect.pm
+++ b/modules/KIWICollect.pm
@@ -1535,6 +1535,7 @@ sub unpackMetapackages {
and defined $this->{m_basesubdir}->{$_}
) {
qx(cp -a $tmp/CD$_/* $this->{m_basesubdir}->{$_});
+ $packageFound = 1;
$this->logMsg('W', "Unpack from old legacy /CD$_ directory");
} elsif ($_ eq 1) {
my $msg;

3
product-builder-1.0.9.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7f31b2b1430cda186d890d52d8eca39eb63710cb4448c5aeac2a8ff3b4d118c
size 1310221

3
product-builder-1.1.3.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:207ef68109d8158e2e3599afe553ce4bd35f73a6dfa053d342d7585a78e9e59b
size 1309197

30
product-builder.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Wed Jun 6 08:57:09 UTC 2018 - adrian@suse.de
- 1.1.3
* Another fix needed for hybrid media on x86_64
-------------------------------------------------------------------
Tue Jun 5 12:46:51 UTC 2018 - adrian@suse.de
- 1.1.2
* Do not generate Apple partion on ppc64le anymore
* Allow to build medias without meta packages again
-------------------------------------------------------------------
Mon Jun 4 13:35:16 UTC 2018 - adrian@suse.de
- 1.1.1
* fix EFI boot sort order
- drop factory skelcd hack (accept_old_meta_package.patch)
-------------------------------------------------------------------
Tue May 29 15:04:31 UTC 2018 - adrian@suse.de
- 1.1.0
* fixed handling of metapackages with multiple lines for one package
filtered via required architecture
* execute mk_listings when configured (bsc#1094929)
+ drop promo / live boot code
* Add riscv64 architecture
-------------------------------------------------------------------
Tue Apr 24 16:22:46 UTC 2018 - adrian@suse.de

6
product-builder.obsinfo
View File

@ -1,5 +1,5 @@
name: product-builder
version: 1.0.9
mtime: 1524586880
commit: ac313bf62d317dba12acbd1f8446242924dca473
version: 1.1.3
mtime: 1528275159
commit: 717e1875568f05082a116dc015563f7bde4ec255

10
product-builder.spec
View File

@ -23,12 +23,10 @@ Url: http://github.com/openSUSE/product-builder
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
Version: 1.0.9
Version: 1.1.3
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
# temporary hack for openSUSE:Factory only
Patch1: accept_old_meta_package.patch
Requires: libxslt
Requires: perl >= %{perl_version}
@ -61,9 +59,6 @@ To be used only for product medias for Leap 15 and SLE 15.
%prep
%setup -q
%if 0%{?skelcd_compat}
%patch1 -p1
%endif
%build
test -e /.buildenv && . /.buildenv
@ -77,9 +72,8 @@ make buildroot="%{buildroot}" \
./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
%files
%defattr(-, root, root)
%dir %{_datadir}/kiwi
%doc LICENSE
%license LICENSE
%{_datadir}/kiwi/.revision
%{_datadir}/kiwi/metadata
%{_datadir}/kiwi/modules