[COMMIT osv-apps master] openjdk8-fedora: Make cpio work on both fedora and ubuntu

9 views
Skip to first unread message

Commit Bot

unread,
Jan 20, 2020, 10:00:10 AM1/20/20
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

openjdk8-fedora: Make cpio work on both fedora and ubuntu

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/openjdk8-fedora/Makefile b/openjdk8-fedora/Makefile
--- a/openjdk8-fedora/Makefile
+++ b/openjdk8-fedora/Makefile
@@ -47,6 +47,8 @@ lcms2_fullname=lcms2-$(lcms2_version).x86_64.rpm

SRC = $(shell readlink -f ../..)

+cpio_extract_option = $(shell cpio --help | grep
-o '\-\-extract-over-symlinks')
+
module:
mkdir -p upstream
wget -c -O upstream/$(java_fullname) $(java_dir)$(java_fullname)
@@ -59,19 +61,19 @@ module:
rm -rf install
mkdir -p install/usr
ln -s lib install/usr/lib64
- rpm2cpio upstream/$(java_fullname) | (cd install && cpio -id
--extract-over-symlinks)
+ rpm2cpio upstream/$(java_fullname) | (cd install && cpio -id
$(cpio_extract_option))
# Move the versioned java directory to the generic "java" name, but
# keep a link at the versioned name:
mv $(jvm_dir)/java-1.8.0-openjdk-$(java_version).x86_64 $(jvm_dir)/java
ln -sf java $(jvm_dir)/java-1.8.0-openjdk-$(java_version).x86_64
rm -rf $(jvm_dir)/java/jre/lib/security/cacerts
rm -rf $(jvm_dir)/java/jre/lib/audio/*
- rpm2cpio upstream/$(tzdata_fullname) | (cd install && cpio -id
--extract-over-symlinks)
- rpm2cpio upstream/$(nspr_fullname) | (cd install && cpio -id
--extract-over-symlinks)
- rpm2cpio upstream/$(nss_fullname) | (cd install && cpio -id
--extract-over-symlinks)
- rpm2cpio upstream/$(nss-util_fullname) | (cd install && cpio -id
--extract-over-symlinks)
- rpm2cpio upstream/$(nss-softokn-freebl_fullname) | (cd install && cpio
-id --extract-over-symlinks)
- rpm2cpio upstream/$(lcms2_fullname) | (cd install && cpio -id
--extract-over-symlinks)
+ rpm2cpio upstream/$(tzdata_fullname) | (cd install && cpio -id
$(cpio_extract_option))
+ rpm2cpio upstream/$(nspr_fullname) | (cd install && cpio -id
$(cpio_extract_option))
+ rpm2cpio upstream/$(nss_fullname) | (cd install && cpio -id
$(cpio_extract_option))
+ rpm2cpio upstream/$(nss-util_fullname) | (cd install && cpio -id
$(cpio_extract_option))
+ rpm2cpio upstream/$(nss-softokn-freebl_fullname) | (cd install && cpio
-id $(cpio_extract_option))
+ rpm2cpio upstream/$(lcms2_fullname) | (cd install && cpio -id
$(cpio_extract_option))
rm -rf install/usr/share/man
ln -s /etc/pki/java/cacerts install/usr/lib/jvm/java/jre/lib/security/

Nadav Har'El

unread,
Jan 20, 2020, 10:05:18 AM1/20/20
to Waldemar Kozaczuk, Osv Dev
On Mon, Jan 20, 2020 at 5:00 PM Commit Bot <b...@cloudius-systems.com> wrote:
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

openjdk8-fedora: Make cpio work on both fedora and ubuntu

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/openjdk8-fedora/Makefile b/openjdk8-fedora/Makefile
--- a/openjdk8-fedora/Makefile
+++ b/openjdk8-fedora/Makefile
@@ -47,6 +47,8 @@ lcms2_fullname=lcms2-$(lcms2_version).x86_64.rpm

  SRC = $(shell readlink -f ../..)

+cpio_extract_option = $(shell cpio --help | grep 
-o '\-\-extract-over-symlinks')

So I don't understand, if it's fine *not* to use this option when not available, why do we
need it at all? Also, in the past we didn't have or need it, why do we suddenly need it?

--
You received this message because you are subscribed to the Google Groups "OSv Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email to osv-dev+u...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/0000000000000d27e8059c938ccc%40google.com.

Waldek Kozaczuk

unread,
Jan 20, 2020, 10:22:19 AM1/20/20
to Nadav Har'El, Osv Dev
On Mon, Jan 20, 2020 at 10:05 Nadav Har'El <n...@scylladb.com> wrote:
On Mon, Jan 20, 2020 at 5:00 PM Commit Bot <b...@cloudius-systems.com> wrote:
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

openjdk8-fedora: Make cpio work on both fedora and ubuntu

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/openjdk8-fedora/Makefile b/openjdk8-fedora/Makefile
--- a/openjdk8-fedora/Makefile
+++ b/openjdk8-fedora/Makefile
@@ -47,6 +47,8 @@ lcms2_fullname=lcms2-$(lcms2_version).x86_64.rpm

  SRC = $(shell readlink -f ../..)

+cpio_extract_option = $(shell cpio --help | grep 
-o '\-\-extract-over-symlinks')

So I don't understand, if it's fine *not* to use this option when not available, why do we
need it at all? Also, in the past we didn't have or need it, why do we suddenly need it?
this app has not worked on Ubuntu for long time because of that cpio issue (it would fail to build with the symlink error). I am suspecting the version of cpio on Fedora handles the symlinks correctly with this option (which is also not present there) and on Ubuntu needs it. Weird. 

Waldek Kozaczuk

unread,
Jan 20, 2020, 10:33:13 AM1/20/20
to Nadav Har'El, Osv Dev
Also please look at my other preceding patch from yesterday which fixed the issue 880 but broke it this way. 
Reply all
Reply to author
Forward
0 new messages