From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/4] package/openjdk: fix installation with merged usr directories
Date: Sat, 18 Apr 2020 14:26:11 +0200 [thread overview]
Message-ID: <20200418122611.GQ5853@scaer> (raw)
In-Reply-To: <20200417232922.3762195-2-aduskett@gmail.com>
Adam, All,
On 2020-04-17 16:29 -0700, aduskett at gmail.com spake thusly:
> From: Adam Duskett <Aduskett@gmail.com>
> Currently, Buildroot installs the jre libraries using
> cp -dprf /build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/
>
> However, if a system has a merged /usr directory, and there is a
> built kernel before installing OpenJDK, the installation fails because
> jre/lib has binary modules file, which causes the following error:
> cp: cannot overwrite directory '/usr/lib/modules with non-directory
[--SNIP--]
> diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
> index edc86c6fbe..d540b65edc 100644
> --- a/package/openjdk/openjdk.mk
> +++ b/package/openjdk/openjdk.mk
[--SNIP--]
> @@ -114,8 +123,12 @@ endef
> # Calling make install always builds and installs the JDK instead of the JRE,
> # which makes manual installation necessary.
> define OPENJDK_INSTALL_TARGET_CMDS
> - cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/* $(TARGET_DIR)/usr/bin/
> - cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/
> + mkdir -p $(TARGET_DIR)/$(OPENJDK_INSTALL_BASE)
> + cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/ \
> + $(TARGET_DIR)/$(OPENJDK_INSTALL_BASE)
> + cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/ \
> + $(TARGET_DIR)/$(OPENJDK_INSTALL_BASE)
Additional nit in addition to the previous review...
When the target is a directory, make it sure to copy to a directory by
appending a trailing '/' :
cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/ \
(TARGET_DIR)/$(OPENJDK_INSTALL_BASE)/
Regards,
Yann E. MORIN.
> + cd $(TARGET_DIR)/usr/bin && ln -snf ../../$(OPENJDK_INSTALL_BASE)/bin/* .
> endef
>
> $(eval $(generic-package))
> --
> 2.25.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-04-18 12:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-17 23:29 [Buildroot] [PATCH 1/4] package/openjdk: fix hash aduskett at gmail.com
2020-04-17 23:29 ` [Buildroot] [PATCH 2/4] package/openjdk: fix installation with merged usr directories aduskett at gmail.com
2020-04-18 12:17 ` Yann E. MORIN
2020-04-18 12:26 ` Yann E. MORIN [this message]
2020-04-17 23:29 ` [Buildroot] [PATCH 3/4] package/openjdk: copy all directories and files when installing aduskett at gmail.com
2020-04-18 12:21 ` Yann E. MORIN
2020-04-18 17:00 ` Adam Duskett
2020-04-17 23:29 ` [Buildroot] [PATCH 4/4] package/openjdk: add support for building the full jdk aduskett at gmail.com
2020-04-18 10:03 ` Thomas Petazzoni
2020-04-18 12:02 ` Yann E. MORIN
2020-04-18 10:01 ` [Buildroot] [PATCH 1/4] package/openjdk: fix hash Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200418122611.GQ5853@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox