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