# HG changeset patch # User Matthew Sheets # Date 1254607235 0 # Node ID 2dbf6030135a983839d0de82462db9980f5a9cb2 # Parent 55ebdca75e490b01baba64f11501814d55820148 Update: java-* - remove files that are already in dependent packages diff -r 55ebdca75e49 -r 2dbf6030135a java-jdk/receipt --- a/java-jdk/receipt Sat Oct 03 20:24:26 2009 +0200 +++ b/java-jdk/receipt Sat Oct 03 22:00:35 2009 +0000 @@ -17,16 +17,6 @@ # tazwok does not define _pkg correctly when both WANTED and SOURCE are set _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg - mkdir -p $fs/usr/bin $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli - cp -a $_pkg/usr/lib/jvm/java-icedtea/jre/lib/i386/jli/libjli.so \ - $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli + mkdir -p $fs/usr/bin cp -a $_pkg/usr/jdk-bin/* $fs/usr/bin - for i in $_pkg/usr/jdk-bin/* ; do - while [ -L $i ]; do - target=$(readlink $i) - mkdir -p $fs$(dirname $target) - cp -a $_pkg$target $fs$target - i=$_pkg$target - done - done } diff -r 55ebdca75e49 -r 2dbf6030135a java-jre/receipt --- a/java-jre/receipt Sat Oct 03 20:24:26 2009 +0200 +++ b/java-jre/receipt Sat Oct 03 22:00:35 2009 +0000 @@ -17,16 +17,6 @@ # tazwok does not define _pkg correctly when both WANTED and SOURCE are set _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg - mkdir -p $fs/usr/bin $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli - cp -a $_pkg/usr/lib/jvm/java-icedtea/jre/lib/i386/jli/libjli.so \ - $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli + mkdir -p $fs/usr/bin cp -a $_pkg/usr/jre-bin/* $fs/usr/bin - for i in $_pkg/usr/jre-bin/* ; do - while [ -L $i ]; do - target=$(readlink $i) - mkdir -p $fs$(dirname $target) - cp -a $_pkg$target $fs$target - i=$_pkg$target - done - done }