summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2017-07-19 13:49:46 +0300
committerRiku Voipio <riku.voipio@linaro.org>2017-07-19 13:49:46 +0300
commit48712a5806bcaaa15ac13b20cce0bc3c45f6ef09 (patch)
treeec8e679411727b065f38c77c8a9a91d157e9ae89
parent5a5ad1b266e7cf396ea266e8849ef5b83e7b4377 (diff)
downloadobs-configs-48712a5806bcaaa15ac13b20cce0bc3c45f6ef09.tar.gz
sync with OBS
-rw-r--r--CentOS:CentOS-7.prjconf4
-rw-r--r--ERP.prj2
-rw-r--r--Ubuntu:16.04.prj6
3 files changed, 9 insertions, 3 deletions
diff --git a/CentOS:CentOS-7.prjconf b/CentOS:CentOS-7.prjconf
index c0b0be3..eb068e7 100644
--- a/CentOS:CentOS-7.prjconf
+++ b/CentOS:CentOS-7.prjconf
@@ -248,8 +248,8 @@ Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
%ifarch s390
Substitute: kernel-binary-packages kernel-s390
%endif
-%ifarch s390x
-Substitute: kernel-binary-packages kernel-default
+%ifarch aarch64
+Substitute: kernel-binary-packages kernel-aarch64
%endif
#
diff --git a/ERP.prj b/ERP.prj
index 1804668..9e68250 100644
--- a/ERP.prj
+++ b/ERP.prj
@@ -2,7 +2,7 @@
<title>Linaro Enterprise Reference Platform</title>
<description>Packages used by LEG team to build ERP</description>
<person userid="Admin" role="maintainer"/>
+ <person userid="fathi.boudra" role="maintainer"/>
<person userid="jenkins" role="maintainer"/>
<person userid="riku.voipio" role="maintainer"/>
- <person userid="fathi.boudra" role="maintainer"/>
</project>
diff --git a/Ubuntu:16.04.prj b/Ubuntu:16.04.prj
index 16a7b4a..7ee0b2f 100644
--- a/Ubuntu:16.04.prj
+++ b/Ubuntu:16.04.prj
@@ -4,27 +4,33 @@
<person userid="Admin" role="maintainer"/>
<repository name="updates">
<download arch="x86_64" url="http://archive.ubuntu.com/ubuntu/xenial-updates/main" repotype="deb"/>
+ <download arch="i586" url="http://archive.ubuntu.com/ubuntu/xenial-updates/main" repotype="deb"/>
<download arch="armv7hl" url="http://ports.ubuntu.com/ubuntu-ports/xenial-updates/main" repotype="deb"/>
<download arch="aarch64" url="http://ports.ubuntu.com/ubuntu-ports/xenial-updates/main" repotype="deb"/>
<path project="Ubuntu:16.04" repository="main"/>
<arch>x86_64</arch>
+ <arch>i586</arch>
<arch>armv7hl</arch>
<arch>aarch64</arch>
</repository>
<repository name="universe">
<download arch="x86_64" url="http://archive.ubuntu.com/ubuntu/xenial/universe" repotype="deb"/>
+ <download arch="i586" url="http://archive.ubuntu.com/ubuntu/xenial/universe" repotype="deb"/>
<download arch="armv7hl" url="http://ports.ubuntu.com/ubuntu-ports/xenial/universe" repotype="deb"/>
<download arch="aarch64" url="http://ports.ubuntu.com/ubuntu-ports/xenial/universe" repotype="deb"/>
<path project="Ubuntu:16.04" repository="main"/>
<arch>x86_64</arch>
+ <arch>i586</arch>
<arch>armv7hl</arch>
<arch>aarch64</arch>
</repository>
<repository name="main">
<download arch="x86_64" url="http://archive.ubuntu.com/ubuntu/xenial/main" repotype="deb"/>
+ <download arch="i586" url="http://archive.ubuntu.com/ubuntu/xenial/main" repotype="deb"/>
<download arch="armv7hl" url="http://ports.ubuntu.com/ubuntu-ports/xenial/main" repotype="deb"/>
<download arch="aarch64" url="http://ports.ubuntu.com/ubuntu-ports/xenial/main" repotype="deb"/>
<arch>x86_64</arch>
+ <arch>i586</arch>
<arch>armv7hl</arch>
<arch>aarch64</arch>
</repository>