Skip to content

Commit a79a290

Browse files
committed
Add Ubuntu Noble (24.04 LTS) package support
1 parent d52602e commit a79a290

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,19 @@ s390x-ubuntu-jammy: ubuntu-jammy
154154
arm64-ubuntu-jammy: ubuntu-jammy
155155
ppc64le-ubuntu-jammy: ubuntu-jammy
156156

157+
# Ubuntu 24.04 (Noble)
158+
ubuntu-noble: PLATFORM=noble
159+
ubuntu-noble: DIST=ubuntu-noble
160+
ubuntu-noble: SPIDERMONKEY=libmozjs-115-0
161+
ubuntu-noble: SPIDERMONKEY_DEV=libmozjs-115-dev
162+
ubuntu-noble: SM_VER=115
163+
ubuntu-noble: noble
164+
noble: debian
165+
166+
s390x-ubuntu-noble: ubuntu-noble
167+
arm64-ubuntu-noble: ubuntu-noble
168+
ppc64le-ubuntu-noble: ubuntu-noble
169+
157170
# RPM default
158171
centos: PKGDIR=../rpmbuild/RPMS/$(PKGARCH)
159172
centos: find-couch-dist link-couch-dist build-rpm copy-pkgs

build.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2929

3030
# TODO derive these by interrogating the couchdb-ci repo rather than hard coding the list
3131
DEBIANS="debian-bullseye debian-bookworm"
32-
UBUNTUS="ubuntu-focal ubuntu-jammy"
32+
UBUNTUS="ubuntu-focal ubuntu-jammy ubuntu-noble"
3333
CENTOSES="centos-8 centos-9"
34-
XPLAT_BASES="debian-bullseye debian-bookworm ubuntu-focal ubuntu-jammy centos-8 centos-9"
34+
XPLAT_BASES="debian-bullseye debian-bookworm ubuntu-focal ubuntu-jammy ubuntu-noble centos-8 centos-9"
3535
XPLAT_ARCHES="arm64 ppc64le s390x"
3636
BINARY_API="https://apache.jfrog.io/artifactory"
3737
ERLANGVERSION=${ERLANGVERSION:-25.3.2.15}
@@ -122,7 +122,8 @@ build-all-couch() {
122122
( ${base} == "debian-bullseye" && ${arch} == "s390x") ||
123123
( ${base} == "debian-bookworm" && ${arch} == "ppc64le" ) ||
124124
( ${base} == "ubuntu-focal" && ${arch} == "ppc64le" ) ||
125-
( ${base} == "ubuntu-jammy" && ${arch} == "ppc64le" )
125+
( ${base} == "ubuntu-jammy" && ${arch} == "ppc64le" ) ||
126+
( ${base} == "ubuntu-noble" && ${arch} == "ppc64le" )
126127
]]; then
127128
CONTAINERARCH="${arch}" build-couch ${base}
128129
fi

repo/conf/distributions

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ Codename: jammy
1717
Components: main
1818
Architectures: amd64 arm64 ppc64el
1919
Description: Official CouchDB Ubuntu 22.04 jammy repository
20+
21+
Codename: noble
22+
Components: main
23+
Architectures: amd64 arm64 ppc64el
24+
Description: Official CouchDB Ubuntu 24.04 noble repository

0 commit comments

Comments
 (0)