From 0baf1086e81b447eb9a4b18c3194c9f2f5e0f653 Mon Sep 17 00:00:00 2001 From: Jiri Date: Tue, 19 Dec 2023 16:10:14 +0100 Subject: [PATCH] Using generated sources for nearly whole debuginfo cpio: jdk-17.0.9+9/make/NONE: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-buffer-deserialize-json.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-buffer-deserialize-json.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-buffer-deserialize-text-glyphs.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-buffer-deserialize-text-glyphs.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-buffer-deserialize-text-unicode.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-buffer-deserialize-text-unicode.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-number-parser.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-number-parser.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-indic-machine.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-indic-machine.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-khmer-machine.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-khmer-machine.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-myanmar-machine.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-myanmar-machine.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-use-machine.hh: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hb-ot-shaper-use-machine.rl: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/adGlobals_aarch64.hpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64.cpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64.hpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64_clone.cpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64_expand.cpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64_format.cpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64_gen.cpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64_misc.cpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/ad_aarch64_pipeline.cpp: Cannot stat: No such file or directory cpio: jdk-17.0.9+9/make/hotspot/dfa_aarch64.cpp: Cannot stat: No such file or directory adapted tests to jdk17 like stile --- java-17-openjdk.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 342a7a4..ec03172 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -331,7 +331,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 -%global rpmrelease 2 +%global rpmrelease 3 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -411,6 +411,7 @@ %define jrebindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin} %global alt_java_name alt-java +%global generated_sources_name generated_sources %global rpm_state_dir %{_localstatedir}/lib/rpm-state/ @@ -1045,6 +1046,7 @@ exit 0 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal %{_jvmdir}/%{sdkdir -- %{?1}}/lib/src.zip %{_jvmdir}/%{sdkdir -- %{?1}}/full_sources +%{_jvmdir}/%{sdkdir -- %{?1}}/%{generated_sources_name} } %define files_static_libs() %{expand: @@ -1775,22 +1777,20 @@ done done %build -# we need to symlink sources to expected lcoation, so debuginfo strip can locate debugsources +# we need to symlink sources to expected location, so debuginfo strip can locate debugsources src_image=`ls -d %{compatiblename}*%{version}*portable.sources.noarch` -ln -s $src_image/%{vcstag} %{vcstag} # this one shpuld be enoug -# cpio is complaining baout several files from build dir. Attempt here, but seems not to be correct -# as those sources are generated during build and so it have to be fixed in portables first +misc_image=`ls -d %{compatiblename}*%{version}*portable.misc.%{_arch}` +cp -rf $misc_image/%{generated_sources_name}/%{vcstag}/ $src_image # it would be nice to remove them once debugsources are generated:( +ln -s $src_image/%{vcstag} %{vcstag} mkdir build pushd build - ln -s ../$src_image/%{vcstag}/src jdk%{featurever}.build - ln -s ../$src_image/%{vcstag}/src jdk%{featurever}.build-fastdebug - ln -s ../$src_image/%{vcstag}/src jdk%{featurever}.build-slowdebug + cp -r ../$misc_image/%{generated_sources_name}/jdk%{featurever}.build* . popd doc_image=`ls -d %{compatiblename}*%{version}*portable.docs.%{_arch}` # in addition the builddir must match the builddir of the portables, including release # be aware, even os may be different, especially with buildonce, repack everywhere # so deducting it from installed deps -portablenvr=`ls -d %{compatiblename}*%{version}*portable*.misc.%{_arch} | sed "s/portable.*.misc.//"` +portablenvr=`echo ${misc_image} | sed "s/portable.*.misc.//"` portablebuilddir=/builddir/build/BUILD # Fix build paths in ELF files so it looks like we built them for file in $(find `pwd` -type f | grep -v -e "$src_image" -e "$doc_image") ; do @@ -1995,6 +1995,7 @@ done cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix} cp -a ${src_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/full_sources +cp -a ${misc_image}/%{generated_sources_name} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix} pushd ${jdk_image} @@ -2066,8 +2067,6 @@ done # See https://bugzilla.redhat.com/show_bug.cgi?id=741821 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs -# copy samples next to demos; samples are mostly js files - # moving config files to /etc mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix} mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib @@ -2410,6 +2409,9 @@ cjc.mainProgram(args) %endif %changelog +* Sat Dec 16 2023 Jiri Vanek - 1:17.0.9.0.9-3 +* using generated sources from portables for final debuginfo + * Sat Dec 09 2023 Jiri Vanek - 1:17.0.9.0.9-2 - proeprly filing debugsources pkg by addedd symlinks restructuring the structure for original build sources