diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-04-05 08:55:17 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-04-05 08:55:17 +0200 |
| commit | 1888d1ad4c07cd02abb4363442584a0ed9a18694 (patch) | |
| tree | 8e3cb7ce4a77ae176d2e76e3daefaa554600822a | |
| parent | 543a1b9d2849effb46500e5e7fe801da9c5ffef2 (diff) | |
| download | coreboot-1888d1ad4c07cd02abb4363442584a0ed9a18694.tar.gz | |
submodules
| -rw-r--r-- | Jenkinsfile | 11 | ||||
| -rw-r--r-- | coreboot.git.spec | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index a12621e..866939c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,6 +11,9 @@ def RPMSource() { [ $class: 'CloneOption', timeout: 60 + ],[ + $class: 'SubmoduleOption', + timeout: 60 ] ], userRemoteConfigs: [ @@ -33,7 +36,13 @@ def RPMBuild() { rm -f *.tar.gz tarball="coreboot-${ghash}.tar.gz" (cd source; git archive --format=tar --prefix="${tarball%.tar.gz}/" HEAD) \ - | gzip > "${tarball}" + > "${tarball%.gz}" + (cd source/3rdparty/vboot; git archive --format=tar \ + --prefix="${tarball%.tar.gz}/3rdparty/vboot/" \ + HEAD) > "vboot.tar" + tar --concatenate --file "${tarball%.gz}" "vboot.tar" + rm "vboot.tar" + gzip "${tarball%.gz}" # tweak spec file sed -i.orig \ diff --git a/coreboot.git.spec b/coreboot.git.spec index f235a34..c26f1e3 100644 --- a/coreboot.git.spec +++ b/coreboot.git.spec @@ -8,7 +8,7 @@ Summary: open source x86 firmware Group: Applications/Emulators License: GPLv2+ Source0: coreboot.git-g0cc33da.tar.xz -Source1: 3rdparty-vboot-gfbf631c.tar.gz +#Source1: 3rdparty-vboot-gfbf631c.tar.gz Source10: config.i440fx.seabios Source11: config.i440fx.seabios.corevga @@ -36,7 +36,7 @@ coreboot tools %prep %setup -q -n %{name} -tar xf %{SOURCE1} +#tar xf %{SOURCE1} %build function do_build() { |