diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-09-27 02:10:48 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-14 12:09:08 +0200 |
| commit | 6e40ad9b6b4579c442c5cceca30481cec6df1875 (patch) | |
| tree | 77891ecf943b7bac5675942d8e8bf38e41f33a53 /rules/sun-java6-jre.make | |
| parent | 14fe545e05cafc573277fae2eb7953e1596f700f (diff) | |
| download | ptxdist-6e40ad9b6b4579c442c5cceca30481cec6df1875.tar.gz ptxdist-6e40ad9b6b4579c442c5cceca30481cec6df1875.tar.xz | |
[sun-java6-jre] don't use ${PTXDIST_WORKSPACE}/projectroot/empty
I could not find any reason to use an extra empty file.
It works for me (tm) and I can't find any difference in the resulting .ipk
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/sun-java6-jre.make')
| -rw-r--r-- | rules/sun-java6-jre.make | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rules/sun-java6-jre.make b/rules/sun-java6-jre.make index 422ccdf57..213915f7a 100644 --- a/rules/sun-java6-jre.make +++ b/rules/sun-java6-jre.make @@ -103,10 +103,8 @@ $(STATEDIR)/sun-java6-jre.targetinstall: if [ $$fgid -eq $$gid ]; then fgid=0; fi; \ ft=$$( LANG=C stat -c %F $(SUN_JAVA6_JRE_DIR)/$$i ); \ case "$$ft" in \ - "regular file") \ - $(call install_copy, sun-java6-jre, $$fuid, $$fgid, $$fperm, $(SUN_JAVA6_JRE_DIR)/$$i, $(PTXCONF_SUN_JAVA6_JRE_TARGET_PREFIX)/$$i);; \ - "regular empty file") \ - $(call install_copy, sun-java6-jre, $$fuid, $$fgid, $$fperm, ${PTXDIST_WORKSPACE}/projectroot/empty, $(PTXCONF_SUN_JAVA6_JRE_TARGET_PREFIX)/$$i);; \ + "regular file"|"regular empty file") \ + $(call install_copy, sun-java6-jre, $$fuid, $$fgid, $$fperm, $(SUN_JAVA6_JRE_DIR)/$$i, $(PTXCONF_SUN_JAVA6_JRE_TARGET_PREFIX)/$$i);; \ "directory") \ $(call install_copy, sun-java6-jre, $$fuid, $$fgid, $$fperm, $(PTXCONF_SUN_JAVA6_JRE_TARGET_PREFIX)/$$i);; \ "symbolic link") \ |