diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-09-30 12:52:25 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 16:15:19 +0100 |
commit | 671780de49f93ec1cc28f5ad2a7eebe211918b85 (patch) | |
tree | 42ebe78d73a3f0a0fa49fb83ff1f2e557c9dc505 /meta/recipes-devtools/sgml-common | |
parent | d95ef2a0aa3116783cd01a905b46fc4920ebae9f (diff) | |
download | poky-671780de49f93ec1cc28f5ad2a7eebe211918b85.tar.gz |
Remove the SGML stack
It is not used for anything, and is something of a pain to maintain.
(From OE-Core rev: 4814d93646f6b86aaffbd3fca1af29c8c577db5b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/sgml-common')
4 files changed, 0 insertions, 228 deletions
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch deleted file mode 100644 index 1f39b03300..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | Patch obtained from OpenEmbedded. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
6 | |||
7 | --- sgml-common-0.6.3/bin/Makefile.am~autohell.patch 2001-01-30 15:42:21.000000000 +0100 | ||
8 | +++ sgml-common-0.6.3/bin/Makefile.am 2004-06-17 11:51:11.000000000 +0200 | ||
9 | @@ -1,6 +1,5 @@ | ||
10 | primitive_scripts = sgmlwhich | ||
11 | |||
12 | -bindir = $(prefix)/bin | ||
13 | bin_SCRIPTS = install-catalog $(primitive_scripts) | ||
14 | |||
15 | EXTRA_DIST = install-catalog.in $(primitive_scripts) | ||
16 | --- /dev/null 2003-09-23 19:59:22.000000000 +0200 | ||
17 | +++ sgml-common-0.6.3/bin/sgmlwhich.in 2004-06-17 11:51:11.000000000 +0200 | ||
18 | @@ -0,0 +1,7 @@ | ||
19 | +#!/bin/sh | ||
20 | +# Location of the main configuration file for consistency with non-LSB platforms | ||
21 | +# Send any comments to Eric Bischoff <eric@caldera.de> | ||
22 | +# This program is under GPL license. See LICENSE file for details. | ||
23 | + | ||
24 | +echo "@sysconfdir@/sgml/sgml.conf" | ||
25 | +# Simple, isn't it? ;-) | ||
26 | --- /dev/null 2003-09-23 19:59:22.000000000 +0200 | ||
27 | +++ sgml-common-0.6.3/config/sgml.conf.in 2004-06-17 11:51:11.000000000 +0200 | ||
28 | @@ -0,0 +1,2 @@ | ||
29 | +SGML_BASE_DIR=@datadir@/sgml | ||
30 | +SGML_CATALOGS_DIR=@sysconfdir@/sgml | ||
31 | --- sgml-common-0.6.3/configure.in~autohell.patch 2001-05-25 18:40:54.000000000 +0200 | ||
32 | +++ sgml-common-0.6.3/configure.in 2004-06-17 11:53:22.000000000 +0200 | ||
33 | @@ -3,11 +3,6 @@ | ||
34 | |||
35 | AM_INIT_AUTOMAKE(sgml-common, 0.6.3) | ||
36 | |||
37 | -docdir='$(prefix)/doc' | ||
38 | -AC_SUBST(docdir) | ||
39 | - | ||
40 | -dnl Checks for programs. | ||
41 | - | ||
42 | dnl Checks for libraries. | ||
43 | |||
44 | dnl Checks for header files. | ||
45 | @@ -18,6 +13,5 @@ | ||
46 | |||
47 | AC_OUTPUT(Makefile \ | ||
48 | bin/Makefile bin/install-catalog \ | ||
49 | - config/Makefile \ | ||
50 | - doc/Makefile doc/HTML/Makefile doc/man/Makefile doc/refentry/Makefile \ | ||
51 | + config/Makefile config/sgml.conf bin/sgmlwhich \ | ||
52 | sgml-iso-entities/Makefile xml-iso-entities/Makefile) | ||
53 | |||
54 | --- sgml-common-0.6.3/Makefile.am~no-docs 2001-05-25 18:22:01.000000000 +0200 | ||
55 | +++ sgml-common-0.6.3/Makefile.am 2004-06-17 11:49:09.000000000 +0200 | ||
56 | @@ -1,4 +1,4 @@ | ||
57 | -SUBDIRS = bin config doc sgml-iso-entities xml-iso-entities | ||
58 | +SUBDIRS = bin config sgml-iso-entities xml-iso-entities | ||
59 | |||
60 | sgmlcodir = $(prefix)/share/sgml | ||
61 | sgmlco_DATA = xml.dcl | ||
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch deleted file mode 100644 index 54b3f54494..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | The COPYING file sgml-common ships with is just a symlink to | ||
2 | /usr/share/automake/COPYING, which means we can't verify it | ||
3 | using our normal means. We workaround this by using this patch | ||
4 | to create our own license file. | ||
5 | |||
6 | Upstream was notified about this on 2011-01-24. When upgrading | ||
7 | this recipe, this should be fixed and you should remove this | ||
8 | patch. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | |||
14 | diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2 | ||
15 | --- sgml-common-0.6.3.orig/LICENSE-GPLv2 1969-12-31 16:00:00.000000000 -0800 | ||
16 | +++ sgml-common-0.6.3/LICENSE-GPLv2 2011-01-28 17:05:17.299528001 -0800 | ||
17 | @@ -0,0 +1,12 @@ | ||
18 | +Copyright (C) 1997 Christian Schwarz <schwarz@debian.org>. | ||
19 | +Copyright (C) 2001-2004 Ardo van Rangelrooij <ardo@debian.org> | ||
20 | + | ||
21 | +This is free software; you may redistribute it and/or modify it under | ||
22 | +the terms of the GNU General Public License as published by the Free | ||
23 | +Software Foundation; either version 2, or (at your option) any later | ||
24 | +version. | ||
25 | + | ||
26 | +This is distributed in the hope that it will be useful, but without | ||
27 | +any warranty; without even the implied warranty of merchantability or | ||
28 | +fitness for a particular purpose. See the GNU General Public License | ||
29 | +for more details. | ||
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb deleted file mode 100644 index 97b308a88b..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | SUMMARY = "Base utilities for working with SGML and XML" | ||
2 | DESCRIPTION = "The sgml-common package gathers very basic \ | ||
3 | stuff necessary to work with SGML and XML, such as xml.dcl, \ | ||
4 | a SGML declaration of XML; iso-entities, a list of the basic \ | ||
5 | SGML ISO entities; and install-catalog, a script used to \ | ||
6 | add entries to (or remove entries from) centralized catalogs \ | ||
7 | whose entries are pointers to SGML open catalogs, \ | ||
8 | as defined by OASIS." | ||
9 | HOMEPAGE = "http://sources.redhat.com/docbook-tools/" | ||
10 | LICENSE = "GPLv2+" | ||
11 | # See the comments in license.patch when upgrading this recipe. | ||
12 | # This is inteded to be a temporary workaround. | ||
13 | LIC_FILES_CHKSUM = "file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b" | ||
14 | SECTION = "base" | ||
15 | |||
16 | PR = "r1" | ||
17 | |||
18 | require sgml-common_${PV}.bb | ||
19 | inherit native | ||
20 | |||
21 | S = "${WORKDIR}/sgml-common-${PV}" | ||
22 | |||
23 | SYSROOT_PREPROCESS_FUNCS += "sgml_common_native_mangle" | ||
24 | SSTATEPOSTINSTFUNCS += "sgml_common_sstate_postinst" | ||
25 | |||
26 | do_install_append() { | ||
27 | # install-catalog script contains hard-coded references to | ||
28 | # {sysconfdir}. Change it to ${D}${sysconfdir}. | ||
29 | sed -i -e "s|${sysconfdir}/sgml|${D}${sysconfdir}/sgml|g" ${D}${bindir}/install-catalog | ||
30 | |||
31 | ${D}${bindir}/install-catalog \ | ||
32 | --add ${D}${sysconfdir}/sgml/sgml-ent.cat \ | ||
33 | ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog | ||
34 | |||
35 | # The sgml-docbook.cat will be regenerated by sstate_postinst | ||
36 | rm -f ${D}${sysconfdir}/sgml/sgml-docbook.cat | ||
37 | } | ||
38 | |||
39 | sgml_common_native_mangle () { | ||
40 | # Revert back to ${sysconfdir} path in install-catalog | ||
41 | sed -i -e "s|${D}${sysconfdir}/sgml|${sysconfdir}/sgml|g" ${SYSROOT_DESTDIR}${STAGING_BINDIR}/install-catalog | ||
42 | # Change path from ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog to ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog in sgml-ent.cat | ||
43 | sed -i -e "s|${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/sgml-ent.cat | ||
44 | # Remove ${D} path from catalog file created by install-catalog script | ||
45 | sed -i -e "s|${D}||g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/catalog | ||
46 | } | ||
47 | |||
48 | sgml_common_sstate_postinst() { | ||
49 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | ||
50 | then | ||
51 | ${bindir}/install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat ${sysconfdir}/sgml/sgml-ent.cat | ||
52 | if [ -e ${sysconfdir}/sgml/sgml-docbook.bak ]; then | ||
53 | for catalog in `awk '{print $2}' ${sysconfdir}/sgml/sgml-docbook.bak`; do | ||
54 | if [ ! `grep $catalog ${sysconfdir}/sgml/sgml-docbook.cat 1> /dev/null 2>&1` ]; then | ||
55 | ${bindir}/install-catalog \ | ||
56 | --add ${sysconfdir}/sgml/sgml-docbook.cat $catalog | ||
57 | fi | ||
58 | done | ||
59 | fi | ||
60 | cat << EOF > ${SSTATE_INST_POSTRM} | ||
61 | #!/bin/sh | ||
62 | |||
63 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
64 | # updated when the package is removed from sstate cache. | ||
65 | if [ -f ${sysconfdir}/sgml/sgml-docbook.cat ]; then | ||
66 | sed -i '/\/sgml\/sgml-ent.cat/d' ${sysconfdir}/sgml/sgml-docbook.cat | ||
67 | fi | ||
68 | EOF | ||
69 | fi | ||
70 | } | ||
diff --git a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb deleted file mode 100644 index 6098673a35..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | SUMMARY = "Base utilities for working with SGML and XML" | ||
2 | DESCRIPTION = "The sgml-common package gathers very basic \ | ||
3 | stuff necessary to work with SGML and XML, such as xml.dcl, \ | ||
4 | a SGML declaration of XML; iso-entities, a list of the basic \ | ||
5 | SGML ISO entities; and install-catalog, a script used to \ | ||
6 | add entries to (or remove entries from) centralized catalogs \ | ||
7 | whose entries are pointers to SGML open catalogs, \ | ||
8 | as defined by OASIS." | ||
9 | HOMEPAGE = "http://sources.redhat.com/docbook-tools/" | ||
10 | LICENSE = "GPLv2+" | ||
11 | # See the comments in license.patch when upgrading this recipe. | ||
12 | # This is inteded to be a temporary workaround. | ||
13 | LIC_FILES_CHKSUM = "file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b" | ||
14 | SECTION = "base" | ||
15 | |||
16 | PR = "r1" | ||
17 | |||
18 | SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-${PV}.tgz \ | ||
19 | file://autohell.patch \ | ||
20 | file://license.patch" | ||
21 | |||
22 | SRC_URI[md5sum] = "103c9828f24820df86e55e7862e28974" | ||
23 | SRC_URI[sha256sum] = "7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959" | ||
24 | |||
25 | inherit autotools | ||
26 | |||
27 | do_compile_append() { | ||
28 | # install-catalog script contains hardcoded references to /etc/sgml | ||
29 | sed -i -e 's|\([ "]\+\)/etc/sgml|\1${sysconfdir}/sgml|g' bin/install-catalog | ||
30 | } | ||
31 | |||
32 | FILES_${PN} += "${datadir}/sgml" | ||
33 | |||
34 | pkg_postinst_${PN}() { | ||
35 | if [ "x$D" = "x" ]; then | ||
36 | install-catalog \ | ||
37 | --add ${sysconfdir}/sgml/sgml-ent.cat \ | ||
38 | ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog | ||
39 | |||
40 | install-catalog \ | ||
41 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ | ||
42 | ${sysconfdir}/sgml/sgml-ent.cat | ||
43 | else | ||
44 | if ! grep -q ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog $D${sysconfdir}/sgml/sgml-ent.cat; then | ||
45 | echo "CATALOG ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog" >> $D${sysconfdir}/sgml/sgml-ent.cat | ||
46 | fi | ||
47 | if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/catalog; then | ||
48 | echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> $D${sysconfdir}/sgml/catalog | ||
49 | fi | ||
50 | |||
51 | if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/sgml-docbook.cat; then | ||
52 | echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> $D${sysconfdir}/sgml/sgml-docbook.cat | ||
53 | fi | ||
54 | if ! grep -q ${sysconfdir}/sgml/sgml-docbook.cat $D${sysconfdir}/sgml/catalog; then | ||
55 | echo "CATALOG ${sysconfdir}/sgml/sgml-docbook.cat" >> $D${sysconfdir}/sgml/catalog | ||
56 | fi | ||
57 | fi | ||
58 | } | ||
59 | |||
60 | pkg_postrm_${PN}() { | ||
61 | install-catalog \ | ||
62 | --remove ${sysconfdir}/sgml/sgml-ent.cat \ | ||
63 | ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog | ||
64 | |||
65 | install-catalog \ | ||
66 | --remove ${sysconfdir}/sgml/sgml-docbook.cat \ | ||
67 | ${sysconfdir}/sgml/sgml-ent.cat | ||
68 | } | ||