Ubuntu
ceph package

Merge ~pushkarnk/ubuntu/+source/ceph:fix-2054332 into ubuntu/+source/ceph:ubuntu/devel

  1. Git
  2. lp:~pushkarnk/ubuntu/+source/ceph
  3. fix-2054332
  4. Merge into ubuntu/devel
Proposed by Pushkar Kulkarni
Status: Needs review
Proposed branch: ~pushkarnk/ubuntu/+source/ceph:fix-2054332
Merge into: ubuntu/+source/ceph:ubuntu/devel
Diff against target: 67 lines (+31/-5)
3 files modified
debian/changelog (+6/-0)
debian/patches/update-java-source-target-flags.patch (+22/-5)
debian/rules (+3/-0)
Reviewer Review Type Date Requested Status
Vladimir Petko (community) Approve
git-ubuntu import Pending
Review via email: mp+460783@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Pushkar Kulkarni (pushkarnk) wrote :

Test build passed: https://launchpad.net/~pushkarnk/+archive/ubuntu/migrate21/+build/27791996

Reply
Revision history for this message
Pushkar Kulkarni (pushkarnk) wrote :

Running builds on all archs in ppa:pushkarnk/migrate21

Reply
Revision history for this message
Vladimir Petko (vpa1977) :
Reply
~pushkarnk/ubuntu/+source/ceph:fix-2054332 updated
37b5253... by Pushkar Kulkarni

Use java_common's java_compat_level to set --release

Revision history for this message
Pushkar Kulkarni (pushkarnk) wrote :

Thanks! I've brought back the -Xlint:-options. Test-builds are currently running in ppa:pushkarnk/migrate21. A passing amd64 build can be seen here [1].

https://launchpad.net/~pushkarnk/+archive/ubuntu/migrate21/+build/27797071

Reply
Revision history for this message
Vladimir Petko (vpa1977) :
review: Approve
Reply
Revision history for this message
Vladimir Petko (vpa1977) wrote :

builds locally, piuparts test (instal/upgrade/purge) fails due to [1]

[1] https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/2054540

Reply
Revision history for this message
Vladimir Petko (vpa1977) wrote :

Uploaded, thank you. The MR should go to merged after the package migrates from proposed.

Reply

Unmerged commits

37b5253... by Pushkar Kulkarni

Use java_common's java_compat_level to set --release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 54d5773..dc2b6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1ceph (18.2.0-0ubuntu7) noble; urgency=medium
2
3 * d/rules, d/patches: Use java_compat_level to set --release (LP: #2054332)
4
5 -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com> Mon, 19 Feb 2024 22:28:18 +0530
6
1ceph (18.2.0-0ubuntu6) noble; urgency=medium7ceph (18.2.0-0ubuntu6) noble; urgency=medium
28
3 * SECURITY UPDATE: Improper bucket validation in POST requests9 * SECURITY UPDATE: Improper bucket validation in POST requests
diff --git a/debian/patches/update-java-source-target-flags.patch b/debian/patches/update-java-source-target-flags.patch
index 6c8b792..75c1e75 100644
--- a/debian/patches/update-java-source-target-flags.patch
+++ b/debian/patches/update-java-source-target-flags.patch
@@ -12,12 +12,29 @@ Last-Update: 2018-04-24
1212
13--- a/src/java/CMakeLists.txt13--- a/src/java/CMakeLists.txt
14+++ b/src/java/CMakeLists.txt14+++ b/src/java/CMakeLists.txt
15@@ -21,7 +21,7 @@ set(java_srcs15@@ -15,13 +15,7 @@
16 # warning: [options] bootstrap class path not set in conjunction with -source 1.716 java/com/ceph/fs/CephStat.java
17 # as per17 java/com/ceph/fs/CephStatVFS.java)
18 # https://blogs.oracle.com/darcy/entry/bootclasspath_older_source18
19-# note: for the -source 1.7 builds, we add
20-# -Xlint:-options
21-# to get rid of the warning
22-# warning: [options] bootstrap class path not set in conjunction with -source 1.7
23-# as per
24-# https://blogs.oracle.com/darcy/entry/bootclasspath_older_source
19-set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8" "-Xlint:-options")25-set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8" "-Xlint:-options")
20+set(CMAKE_JAVA_COMPILE_FLAGS "--release" "7" "-Xlint:-options")26+set(CMAKE_JAVA_COMPILE_FLAGS "--release" $ENV{JAVA_TARGET_RELEASE} "-Xlint:-options")
21 set(jni_header_dir "${CMAKE_CURRENT_BINARY_DIR}/native")27 set(jni_header_dir "${CMAKE_CURRENT_BINARY_DIR}/native")
22 if(CMAKE_VERSION VERSION_LESS 3.11)28 if(CMAKE_VERSION VERSION_LESS 3.11)
23 set(CMAKE_JAVA_COMPILE_FLAGS ${CMAKE_JAVA_COMPILE_FLAGS} "-h" ${jni_header_dir})29 set(CMAKE_JAVA_COMPILE_FLAGS ${CMAKE_JAVA_COMPILE_FLAGS} "-h" ${jni_header_dir})
30--- a/src/rocksdb/java/CMakeLists.txt
31+++ b/src/rocksdb/java/CMakeLists.txt
32@@ -4,7 +4,7 @@
33 message("Please consider switching to CMake 3.11.4 or newer")
34 endif()
35
36-set(CMAKE_JAVA_COMPILE_FLAGS -source 7)
37+set(CMAKE_JAVA_COMPILE_FLAGS -source $ENV{JAVA_TARGET_RELEASE})
38
39 set(JNI_NATIVE_SOURCES
40 rocksjni/backup_engine_options.cc
diff --git a/debian/rules b/debian/rules
index 5babc6c..fd03d8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,9 @@ export JAVA_HOME=/usr/lib/jvm/default-java
57## Set JAVAC to prevent FTBFS due to incorrect use of 'gcj' if found (see "m4/ac_prog_javac.m4").57## Set JAVAC to prevent FTBFS due to incorrect use of 'gcj' if found (see "m4/ac_prog_javac.m4").
58export JAVAC=javac58export JAVAC=javac
5959
60include /usr/share/java/java_defaults.mk
61export JAVA_TARGET_RELEASE=$(java_compat_level)
62
60extraopts += -DWITH_OCF=ON -DWITH_NSS=ON -DWITH_PYTHON3=ON -DWITH_DEBUG=ON63extraopts += -DWITH_OCF=ON -DWITH_NSS=ON -DWITH_PYTHON3=ON -DWITH_DEBUG=ON
61extraopts += -DWITH_PYTHON2=OFF -DMGR_PYTHON_VERSION=364extraopts += -DWITH_PYTHON2=OFF -DMGR_PYTHON_VERSION=3
62extraopts += -DWITH_PYTHON3=365extraopts += -DWITH_PYTHON3=3

Subscribers

People subscribed via source and target branches