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

Subscribers

People subscribed via source and target branches