FYI: More FSG work
Andrew John Hughes
gnu_andrew at member.fsf.org
Wed Jul 2 15:43:56 PDT 2008
This adds a new script, based on the one doko uses to
create the Debian/Ubuntu builds. We apply it in OpenJDK extraction,
so the results get poured into the fsg tarball when created.
ChangeLog:
2008-07-02 Andrew John Hughes <gnu_andrew at member.fsf.org>
* HACKING: Update with FSG list
and further bug numbers.
* Makefile.am: Remove jscheme removal
and add in new fsg script.
* Makefile.in: Regenerated.
* fsg.sh: Script to sanitise OpenJDK before
building and for the fsg tarball.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 36d1d3a135f5 HACKING
--- a/HACKING Wed Jul 02 15:00:43 2008 -0400
+++ b/HACKING Wed Jul 02 23:37:01 2008 +0100
@@ -4,7 +4,17 @@ PRx denotes bug x in the IcedTea bug dat
PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
-The following patches are currently applied to OpenJDK or OpenJDK6 by IcedTea:
+The following patches are applied early in the build to meet the Free Software guidelines and are also
+included in the tarball resulting from the dist-openjdk-fsg target:
+
+* icedtea-idl.patch: Fix IDL licenses (PR141/S6695776).
+* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140/S6695776).
+* icedtea-license-headers.patch: Generate GPL header from automulti tool (PR148,S6713083).
+
+The fsg.sh script is also run to delete certain files with dubious licensing and/or only occuring
+in binary format.
+
+The following patches are currently applied before the building of OpenJDK or OpenJDK6 by IcedTea:
* icedtea-ant.patch: Remove use of $(ANT_HOME).
* icedtea-arm-uname.patch: Handle output of uname on arm.
@@ -25,15 +35,12 @@ The following patches are currently appl
* icedtea-gervill.patch: Add support for Gervill from the overlay.
* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
-* icedtea-idl.patch: Fix IDL licenses (PR141).
* icedtea-javafiles.patch: Add missing Java files to list.
* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
-* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140).
* icedtea-lcms-leak.patch: Fix LCMS memory leak.
* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
* icedtea-libraries.patch: Use system JPEG and zlib libraries.
-* icedtea-license-headers.patch: Generate GPL header from automulti tool.
* icedtea-linker-options.patch: Add -Xlinker option when linking.
* icedtea-memory-limits.patch: Increase default memory limits.
* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
diff -r 36d1d3a135f5 Makefile.am
--- a/Makefile.am Wed Jul 02 15:00:43 2008 -0400
+++ b/Makefile.am Wed Jul 02 23:37:01 2008 +0100
@@ -4,8 +4,6 @@ OPENJDK_VERSION = b10
CACAO_VERSION = 0.99.1
CACAO_MD5SUM = 2337754d0c165af556e97395e9a5e5af
-
-JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
if ENABLE_LIVECONNECT
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
@@ -430,8 +428,7 @@ stamps/extract.stamp: stamps/download.st
mkdir openjdk ; \
$(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
- rm -rf $(JSCHEME_DIR)/lib; \
- rm -rf $(JSCHEME_DIR)/scripts; \
+ sh $(srcdir)/fsg.sh ; \
fi
if WITH_CACAO
if !USE_SYSTEM_CACAO
diff -r 36d1d3a135f5 Makefile.in
--- a/Makefile.in Wed Jul 02 15:00:43 2008 -0400
+++ b/Makefile.in Wed Jul 02 23:37:01 2008 +0100
@@ -267,7 +267,6 @@ OPENJDK_VERSION = b10
OPENJDK_VERSION = b10
CACAO_VERSION = 0.99.1
CACAO_MD5SUM = 2337754d0c165af556e97395e9a5e5af
-JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
@ENABLE_LIVECONNECT_FALSE at ICEDTEAPLUGIN_CLEAN =
@ENABLE_LIVECONNECT_TRUE at ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
@ENABLE_LIVECONNECT_FALSE at ICEDTEAPLUGIN_TARGET =
@@ -906,8 +905,7 @@ stamps/extract.stamp: stamps/download.st
mkdir openjdk ; \
$(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
- rm -rf $(JSCHEME_DIR)/lib; \
- rm -rf $(JSCHEME_DIR)/scripts; \
+ sh $(srcdir)/fsg.sh ; \
fi
@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \
@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \
diff -r 36d1d3a135f5 fsg.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fsg.sh Wed Jul 02 23:37:01 2008 +0100
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+echo "Further liberating OpenJDK..."
+
+# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+# PR146/S6713083
+# Remove binaries
+rm -f \
+ openjdk/jdk/test/sun/management/windows/revokeall.exe \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
+
+rm -f \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
+
+rm -f \
+ openjdk/jdk/make/tools/winver/bin/winver.exe \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
+
+# Remove test sources with questionable license headers.
+rm -f \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
+ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
+ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
+ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTest.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
+ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
+ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
+
+# Remove J2DBench sources, some of which have questionable license
+# headers.
+rm -rf \
+ openjdk/jdk/src/share/demo/java2d/J2DBench
+
+# BEGIN Debian/Ubuntu additions
+
+# binary files
+rm -f \
+ openjdk/jdk/test/sun/net/idn/nfscis.spp
+
+# has w3c copyright. license to be checked / needs checking after decoding
+rm -f \
+ openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet \
+ openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64
+
+# TODO
+#$ find openjdk -name '*.jar' -o -name '*.class'|grep -v test
+
+# PR140, S6695776
+# Also see patches/icedtea-jscheme.patch
+rm -rf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib
+rm -rf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts
+
+# PR139, S6710791
+rm -f \
+ openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \
+ openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \
+
+# PR157, S6713083
+rm -f \
+ openjdk/jdk/src/share/classes/java/lang/instrument/package.html
+
+# END Debian/Ubuntu additions
+
More information about the distro-pkg-dev
mailing list