#34 Remove lib/client/classes.jsa from packaged files
Merged 2 years ago by jerboaa. Opened 2 years ago by jerboaa.
rpms/ jerboaa/java-11-openjdk remove-client-classes  into  master

file modified
+6 -8
@@ -614,11 +614,9 @@ 

  %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*

  %{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1*

  %{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/

- %{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/

  %ifarch %{jit_arches}

  %ifnarch %{power64}

  %attr(444, root, root) %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/classes.jsa

- %attr(444, root, root) %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/classes.jsa

  %endif

  %endif

  %dir %{etcjavasubdir}
@@ -960,7 +958,7 @@ 

  

  Name:    java-%{javaver}-%{origin}

  Version: %{newjavaver}.%{buildver}

- Release: 5%{?dist}

+ Release: 6%{?dist}

  # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons

  # and this change was brought into RHEL-4. java-1.5.0-ibm packages

  # also included the epoch in their virtual provides. This created a
@@ -1604,11 +1602,6 @@ 

  cp -a %{buildoutputdir -- $suffix}/images/%{jdkimage} \

    $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}

  

- # Install jsa directories so we can owe them

- mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/%{archinstall}/server/

- mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/%{archinstall}/client/

- mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/ || true  ; # sometimes is here, sometimes not, ifout it or || true it out

- 

  pushd %{buildoutputdir $suffix}/images/%{jdkimage}

  

  %if %{with_systemtap}
@@ -1888,6 +1881,11 @@ 

  

  

  %changelog

+ * Tue Feb 26 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.2.7-6

+ - Don't package lib/client and lib/client/classes.jsa

+   which don't exist.

+ - Resolves: RHBZ#1643469

+ 

  * Tue Feb 19 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.2.7-5

  - Add explicit requirement for libXcomposite which is used when performing

    screenshots from Java.

This file is listed in %files but doesn't exist. As such, removal
fails when packages are upgraded. See RHBZ#1643469. This fixes it.

Resolves: rhbz#1643469

On neither x86_64 nor i686 I see any files in lib/client:

 # rpm -ql java-11-openjdk-headless | grep client
 /usr/lib/jvm/java-11-openjdk-11.0.2.7-1.fc30.i386/lib/client
 /usr/lib/jvm/java-11-openjdk-11.0.2.7-1.fc30.i386/lib/client/classes.jsa
 # ls /usr/lib/jvm/java-11-openjdk-11.0.2.7-1.fc30.i386/lib/client
 # ls /usr/lib/jvm/java-11-openjdk-11.0.2.7-1.fc30.i386/lib/client/classes.jsa
 ls: cannot access '/usr/lib/jvm/java-11-openjdk-11.0.2.7-1.fc30.i386/lib/client/classes.jsa': No such file or directory

 $ rpm -ql java-11-openjdk-headless | grep client
 /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/client
 /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/client/classes.jsa
 $ ls /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/client/classes.jsa
 ls: cannot access '/usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/client/classes.jsa': No such file or directory

Let's see what the CI build thinks of it.

Ready for review. The s390 build failure is unrelated.

rebased onto 1d2c23877f5175cab2737d008bd2b8d3cffe185f

2 years ago

Issue is gone post this patch as shown below. Upgrade from -4 build (initial CI build) to -5 build (latest CI build).

===================================================================================================================================================================================================================
 Package                                                     Arch                                      Version                                               Repository                                       Size
===================================================================================================================================================================================================================
Upgrading:
 java-11-openjdk                                             x86_64                                    1:11.0.2.7-5.fc30                                     @commandline                                    222 k
 java-11-openjdk-devel                                       x86_64                                    1:11.0.2.7-5.fc30                                     @commandline                                    3.3 M
 java-11-openjdk-headless                                    x86_64                                    1:11.0.2.7-5.fc30                                     @commandline                                     39 M

Transaction Summary
===================================================================================================================================================================================================================
Upgrade  3 Packages

Total size: 43 M
Downloading Packages:
Running transaction check
Transaction check succeeded.
Running transaction test
Transaction test succeeded.
Running transaction
  Running scriptlet: java-11-openjdk-headless-1:11.0.2.7-5.fc30.x86_64                                                                                                                                         1/1 
  Preparing        :                                                                                                                                                                                           1/1 
  Upgrading        : java-11-openjdk-headless-1:11.0.2.7-5.fc30.x86_64                                                                                                                                         1/6 
  Running scriptlet: java-11-openjdk-headless-1:11.0.2.7-5.fc30.x86_64                                                                                                                                         1/6 
  Upgrading        : java-11-openjdk-1:11.0.2.7-5.fc30.x86_64                                                                                                                                                  2/6 
  Running scriptlet: java-11-openjdk-1:11.0.2.7-5.fc30.x86_64                                                                                                                                                  2/6 
  Upgrading        : java-11-openjdk-devel-1:11.0.2.7-5.fc30.x86_64                                                                                                                                            3/6 
  Running scriptlet: java-11-openjdk-devel-1:11.0.2.7-5.fc30.x86_64                                                                                                                                            3/6 
  Cleanup          : java-11-openjdk-devel-1:11.0.2.7-4.fc30.x86_64                                                                                                                                            4/6 
  Running scriptlet: java-11-openjdk-devel-1:11.0.2.7-4.fc30.x86_64                                                                                                                                            4/6 
  Cleanup          : java-11-openjdk-1:11.0.2.7-4.fc30.x86_64                                                                                                                                                  5/6 
  Running scriptlet: java-11-openjdk-1:11.0.2.7-4.fc30.x86_64                                                                                                                                                  5/6 
  Cleanup          : java-11-openjdk-headless-1:11.0.2.7-4.fc30.x86_64                                                                                                                                         6/6 
  Running scriptlet: java-11-openjdk-headless-1:11.0.2.7-4.fc30.x86_64                                                                                                                                         6/6 
  Running scriptlet: java-11-openjdk-1:11.0.2.7-5.fc30.x86_64                                                                                                                                                  6/6 
  Running scriptlet: java-11-openjdk-devel-1:11.0.2.7-5.fc30.x86_64                                                                                                                                            6/6 
  Running scriptlet: java-11-openjdk-headless-1:11.0.2.7-4.fc30.x86_64                                                                                                                                         6/6 
  Verifying        : java-11-openjdk-1:11.0.2.7-5.fc30.x86_64                                                                                                                                                  1/6 
  Verifying        : java-11-openjdk-1:11.0.2.7-4.fc30.x86_64                                                                                                                                                  2/6 
  Verifying        : java-11-openjdk-devel-1:11.0.2.7-5.fc30.x86_64                                                                                                                                            3/6 
  Verifying        : java-11-openjdk-devel-1:11.0.2.7-4.fc30.x86_64                                                                                                                                            4/6 
  Verifying        : java-11-openjdk-headless-1:11.0.2.7-5.fc30.x86_64                                                                                                                                         5/6 
  Verifying        : java-11-openjdk-headless-1:11.0.2.7-4.fc30.x86_64                                                                                                                                         6/6

Upgraded:
  java-11-openjdk-1:11.0.2.7-5.fc30.x86_64                         java-11-openjdk-devel-1:11.0.2.7-5.fc30.x86_64                         java-11-openjdk-headless-1:11.0.2.7-5.fc30.x86_64

Complete!
INFO: 
Finish: run

Is -Xshare:dump being run?

Is -Xshare:dump being run?

Yes, in the post-installation scriptlet:
https://src.fedoraproject.org/rpms/java-11-openjdk/blob/master/f/java-11-openjdk.spec#_311

There is only a server JVM, though:

  $ rpm -ql java-11-openjdk-headless | grep classes
  /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/client/classes.jsa
  /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/server/classes.jsa
  $ ll /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/server/classes.jsa
  -r--r--r--. 1 root root 18145280 Feb  6 10:02 /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/server/classes.jsa
  $ ll /usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/client/classes.jsa
  ls: cannot access '/usr/lib/jvm/java-11-openjdk-11.0.2.7-0.fc29.x86_64/lib/client/classes.jsa': No such file or directory

See also the output in comment 7, which shows that there is no libjvm.so in lib/client folder.

Sure. Thanx for catch.

rebased onto 95df2b6

2 years ago

Pull-Request has been merged by jerboaa

2 years ago