Commit 903729e1 authored by Sjoerd Simons's avatar Sjoerd Simons Committed by Andrew Lee (李健秋)
Browse files

Update patches

* Remove stray debug print from
  backend-Handle-ERROR_WANT_-READ-WRITE-from-ssl-reads.patch
* Add patches against BSConfig.pm to all release pools ortogonal and
  to read a BSConfig.local.pm file by default if exists.
parent cd222048
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue, 21 Mar 2017 11:42:13 +0100
Subject: BSConfig: Make every architecture its own relsync pool
Linking up e.g. all intel architectures and ARM 32 bit architectures in
one pool really isn't useful for our general usage of OBS. So split each
architecture in a seperate pool.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---
src/backend/BSConfig.pm.template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/backend/BSConfig.pm.template b/src/backend/BSConfig.pm.template
index 7c86809..5758256 100644
--- a/src/backend/BSConfig.pm.template
+++ b/src/backend/BSConfig.pm.template
@@ -127,28 +127,28 @@ our $packtrack = [];
our $relsync_pool = {
"local" => "local",
"i586" => "i586",
- "x86_64" => "i586",
+ "x86_64" => "x86_64",
"ppc" => "ppc",
- "ppc64" => "ppc",
- "ppc64le" => "ppc",
+ "ppc64" => "ppc64",
+ "ppc64le" => "ppc64le",
"mips" => "mips",
- "mips64" => "mips",
+ "mips64" => "mips64",
"mipsel" => "mipsel",
- "mips64el" => "mipsel",
- "aarch64" => "arm",
- "aarch64_ilp32" => "arm",
- "armv4l" => "arm",
- "armv5l" => "arm",
- "armv6l" => "arm",
- "armv6hl" => "arm",
- "armv7l" => "arm",
- "armv7hl" => "arm",
+ "mips64el" => "mips64el",
+ "aarch64" => "aarch64",
+ "aarch64_ilp32" => "aarch64_ilp32",
+ "armv4l" => "armv4l",
+ "armv5l" => "armv5l",
+ "armv6l" => "armv6l",
+ "armv6hl" => "arm6hl",
+ "armv7l" => "arm7l",
+ "armv7hl" => "arm7hl",
"armv5el" => "armv5el", # they do not exist
"armv6el" => "armv6el",
"armv7el" => "armv7el",
"armv8el" => "armv8el",
"sparcv9" => "sparcv9",
- "sparc64" => "sparcv9",
+ "sparc64" => "sparc64",
};
#No extra stage server sync
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue, 21 Mar 2017 11:45:31 +0100
Subject: BSConfig: Read a BSConfig.local.pm if it exists
BSConfig.<hostname>.pm is neat but it can be tricky (and breaks if the
hostname changes or perl doesn't get teh fqdn in the expected form). So
instead add a statically named BSConfig.local.pm to be read.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---
src/backend/BSConfig.pm.template | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/backend/BSConfig.pm.template b/src/backend/BSConfig.pm.template
index 5758256..b4c82f3 100644
--- a/src/backend/BSConfig.pm.template
+++ b/src/backend/BSConfig.pm.template
@@ -229,4 +229,10 @@ if (-r $hostconfig) {
require $hostconfig;
}
+my $localconfig = "/etc/obs/BSConfig.local.pm";
+if (-r $localconfig) {
+ print STDERR "reading $localconfig...\n";
+ require $localconfig;
+}
+
1;
Description: Fix brackets in Makefile thst prepare to run sphine.
Author: Andrew Lee (李健秋) <ajqlee@debian.org>
--- open-build-service-2.7.1.orig/src/api/Makefile
+++ open-build-service-2.7.1/src/api/Makefile
@@ -14,7 +14,8 @@ prepare_dirs:
$(INSTALL) -d -m 755 $(DESTDIR)$(OBS_API_PREFIX)/tmp
$(INSTALL) -d -m 755 $(DESTDIR)$(OBS_API_PREFIX)/config
# prepare for running sphinx daemon
- $(INSTALL) -m 0755 -d $(DESTDIR)$(OBS_API_PREFIX)/db/sphinx{,/production}
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(OBS_API_PREFIX)/db/sphinx
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(OBS_API_PREFIX)/db/sphinx/production
prepare_rake: prepare_dirs
cp -a * $(DESTDIR)$(OBS_API_PREFIX)
...@@ -28,3 +28,5 @@ Put-binary-uploads-in-architecture-dependent-subdirectori.patch ...@@ -28,3 +28,5 @@ Put-binary-uploads-in-architecture-dependent-subdirectori.patch
Correct-reprepro-argument-to-match-current-version.patch Correct-reprepro-argument-to-match-current-version.patch
backend-Handle-ERROR_WANT_-READ-WRITE-from-ssl-reads.patch backend-Handle-ERROR_WANT_-READ-WRITE-from-ssl-reads.patch
backend-Support-https-urls-for-package-downloads.patch backend-Support-https-urls-for-package-downloads.patch
BSConfig-Make-every-architecture-its-own-relsync-pool.patch
BSConfig-Read-a-BSConfig.local.pm-if-it-exists.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment