You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2023/05/25 18:54:38 UTC
[couchdb-pkg] branch main updated (988eb4c -> 73f295d)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
from 988eb4c Add arm64/ppc64le/s390x arches for ubuntu
new 781f25f Add s390x support to RHEL 9 RPM packages
new e5b6e94 Add s390x support to RHEL 8 RPM pkg
new f9b5110 Add centos-8, centos-9 and ubuntu-jammy to XPLAT_BASES
new 73f295d Add el9 "server" aliase in upload-couch()
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 27 +++++++++++++++++++++++----
build.sh | 14 +++++++++++---
rpm/SPECS/couchdb.spec.in | 7 ++-----
3 files changed, 36 insertions(+), 12 deletions(-)
[couchdb-pkg] 03/04: Add centos-8, centos-9 and ubuntu-jammy to XPLAT_BASES
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit f9b511079a10ab7e5a8243350383063cc8dae08f
Author: Kun-Lu <ku...@ibm.com>
AuthorDate: Wed May 24 15:09:09 2023 -0400
Add centos-8, centos-9 and ubuntu-jammy to XPLAT_BASES
Signed-off-by: Kun-Lu <ku...@ibm.com>
---
Makefile | 8 ++++++++
build.sh | 8 ++++----
rpm/SPECS/couchdb.spec.in | 3 ---
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 7e8940f..75fdd70 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,10 @@ ubuntu-jammy: SM_VER=78
ubuntu-jammy: jammy
jammy: debian
+s390x-ubuntu-jammy: ubuntu-jammy
+arm64-ubuntu-jammy: ubuntu-jammy
+ppc64le-ubuntu-jammy: ubuntu-jammy
+
# RPM default
centos: PKGDIR=../rpmbuild/RPMS/$(PKGARCH)
centos: find-couch-dist link-couch-dist build-rpm copy-pkgs
@@ -177,8 +181,12 @@ almalinux-8: centos-8
almalinux-9: centos-9
# s390x RHEL 8 clone based
s390x-centos-8: centos-8
+ppc64le-centos-8: centos-8
# s390x RHEL 9 clone based
s390x-centos-9: centos-9
+arm64-centos-9: PKGARCH=aarch64
+arm64-centos-9: centos-9
+ppc64le-centos-9: centos-9
# aarch64 RHEL-based
aarch64-rhel: DIST=rhel
diff --git a/build.sh b/build.sh
index 4e8af25..1c7eb91 100755
--- a/build.sh
+++ b/build.sh
@@ -31,7 +31,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DEBIANS="debian-buster debian-bullseye"
UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
CENTOSES="centos-7 centos-8 centos-9"
-XPLAT_BASES="debian-bullseye ubuntu-focal"
+XPLAT_BASES="debian-bullseye ubuntu-focal ubuntu-jammy centos-8 centos-9"
XPLAT_ARCHES="arm64 ppc64le s390x"
BINARY_API="https://apache.jfrog.io/artifactory"
ERLANGVERSION=${ERLANGVERSION:-24.3.4.10}
@@ -109,11 +109,11 @@ build-all-couch() {
done
for base in $XPLAT_BASES; do
for arch in $XPLAT_ARCHES; do
- CONTAINERARCH="${arch}" build-couch ${base}
+ if [[ ${base} != "centos-8" ]] || [[ ${arch} != "arm64" ]]; then
+ CONTAINERARCH="${arch}" build-couch ${base}
+ fi
done
done
- CONTAINERARCH="s390x" build-couch centos-8
- CONTAINERARCH="s390x" build-couch centos-9
}
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 5c431e5..863c203 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -94,9 +94,6 @@ languages and environments.
%define __os_install_post %{nil}
%prep
-%ifarch aarch64
-%patch01 -p1
-%endif
%build
./configure --spidermonkey-version=%SM_VER%
[couchdb-pkg] 01/04: Add s390x support to RHEL 9 RPM packages
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 781f25f4d9ae9042b86ee696be993775e1d9cbf2
Author: Kun-Lu <ku...@ibm.com>
AuthorDate: Tue May 23 09:27:45 2023 -0400
Add s390x support to RHEL 9 RPM packages
Signed-off-by: Kun-Lu <ku...@ibm.com>
---
Makefile | 12 ++++++++++++
build.sh | 3 ++-
rpm/SPECS/couchdb.spec.in | 4 ++--
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 97424f5..e113dd1 100644
--- a/Makefile
+++ b/Makefile
@@ -164,11 +164,23 @@ centos8: SPIDERMONKEY_DEV=mozjs60-devel
centos8: SM_VER=60
centos8: sm-ver-rpm make-rpmbuild centos
+centos-9: DIST=centos-9
+centos-9: centos9
+centos9: SPIDERMONKEY=mozjs78
+centos9: SPIDERMONKEY_DEV=mozjs78-devel
+centos9: SM_VER=78
+centos9: sm-ver-rpm make-rpmbuild centos
+
# Rocky 8 is a CentOS 8 alias
rocky-8: centos-8
rocky-8.6: centos-8
rocky-8.7: centos-8
+# Rocky 9 is a CentOS 9 alias
+rocky-9: centos-9
+# s390x RHEL clone 9 based
+s390x-centos-9: centos-9
+
# aarch64 RHEL-based
aarch64-rhel: DIST=rhel
# Needs 68 for aarch compat, we're using the included one here
diff --git a/build.sh b/build.sh
index a65209a..9fd6e06 100755
--- a/build.sh
+++ b/build.sh
@@ -30,7 +30,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# TODO derive these by interrogating the couchdb-ci repo rather than hard coding the list
DEBIANS="debian-buster debian-bullseye"
UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
-CENTOSES="centos-7 centos-8"
+CENTOSES="centos-7 centos-8 centos-9"
XPLAT_BASES="debian-bullseye ubuntu-focal"
XPLAT_ARCHES="arm64 ppc64le s390x"
BINARY_API="https://apache.jfrog.io/artifactory"
@@ -112,6 +112,7 @@ build-all-couch() {
CONTAINERARCH="${arch}" build-couch ${base}
done
done
+ CONTAINERARCH="s390x" build-couch centos-9
}
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 84a9c1a..5c431e5 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -28,8 +28,8 @@ Prefix: %{prefix}
Group: Applications/Databases
URL: https://couchdb.apache.org/
Vendor: The Apache Software Foundation
-BuildArch: x86_64 ppc64le aarch64
-ExclusiveArch: x86_64 ppc64le aarch64
+BuildArch: x86_64 ppc64le aarch64 s390x
+ExclusiveArch: x86_64 ppc64le aarch64 s390x
Exclusiveos: linux
Packager: CouchDB Developers <de...@couchdb.apache.org>
Patch1: 0001-build-with-sm68-on-aarch64.patch
[couchdb-pkg] 02/04: Add s390x support to RHEL 8 RPM pkg
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit e5b6e949d15643bed32a4e2906a53b3ead8d9e97
Author: Kun-Lu <ku...@ibm.com>
AuthorDate: Tue May 23 13:55:02 2023 -0400
Add s390x support to RHEL 8 RPM pkg
Signed-off-by: Kun-Lu <ku...@ibm.com>
---
Makefile | 15 +++++++--------
build.sh | 1 +
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index e113dd1..7e8940f 100644
--- a/Makefile
+++ b/Makefile
@@ -171,14 +171,13 @@ centos9: SPIDERMONKEY_DEV=mozjs78-devel
centos9: SM_VER=78
centos9: sm-ver-rpm make-rpmbuild centos
-# Rocky 8 is a CentOS 8 alias
-rocky-8: centos-8
-rocky-8.6: centos-8
-rocky-8.7: centos-8
-
-# Rocky 9 is a CentOS 9 alias
-rocky-9: centos-9
-# s390x RHEL clone 9 based
+# Almalinux 8 is a CentOS 8 alias
+almalinux-8: centos-8
+# Almalinux 9 is a CentOS 9 alias
+almalinux-9: centos-9
+# s390x RHEL 8 clone based
+s390x-centos-8: centos-8
+# s390x RHEL 9 clone based
s390x-centos-9: centos-9
# aarch64 RHEL-based
diff --git a/build.sh b/build.sh
index 9fd6e06..4e8af25 100755
--- a/build.sh
+++ b/build.sh
@@ -112,6 +112,7 @@ build-all-couch() {
CONTAINERARCH="${arch}" build-couch ${base}
done
done
+ CONTAINERARCH="s390x" build-couch centos-8
CONTAINERARCH="s390x" build-couch centos-9
}
[couchdb-pkg] 04/04: Add el9 "server" aliase in upload-couch()
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 73f295d0a35bed3cd08985ea74d1318b44e8505f
Author: Kun-Lu <ku...@ibm.com>
AuthorDate: Thu May 25 10:38:31 2023 -0400
Add el9 "server" aliase in upload-couch()
Signed-off-by: Kun-Lu <ku...@ibm.com>
---
build.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/build.sh b/build.sh
index 1c7eb91..72c7db7 100755
--- a/build.sh
+++ b/build.sh
@@ -175,6 +175,12 @@ upload-couch() {
RELPATH="${DIST}/${PKGARCH}/${fname}"
SUFFIX=""
binary-upload
+ elif [ ${DIST} == "el9" ]; then
+ # see https://github.com/apache/couchdb-pkg/issues/103
+ DIST="el9Server"
+ RELPATH="${DIST}/${PKGARCH}/${fname}"
+ SUFFIX=""
+ binary-upload
fi
done
echo "Recalculating Debian repo metadata..."