[OE-core] [PATCH 02/21] matchbox-wm 1.2: remove it

Robert Yang liezhi.yang at windriver.com
Tue Feb 3 01:11:56 UTC 2015


It doesn't work:
ERROR: matchbox-wm: Recipe file does not have license file information (LIC_FILES_CHKSUM)
ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix

And there is a matchbox-wm_git.bb, they have the same GPLv2+ license.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
 .../matchbox-wm/matchbox-wm/configure_fix.patch    |   15 --------
 .../matchbox-wm/matchbox-wm/gconf-2.m4             |   39 --------------------
 .../matchbox-wm/matchbox-wm_1.2.bb                 |   39 --------------------
 3 files changed, 93 deletions(-)
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
deleted file mode 100644
index 800bf3b..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: matchbox-window-manager/configure.ac
-===================================================================
---- matchbox-window-manager.orig/configure.ac	2007-11-14 12:02:28.000000000 +0000
-+++ matchbox-window-manager/configure.ac	2007-11-14 12:18:55.000000000 +0000
-@@ -283,7 +283,7 @@
-     yes)
- 
- 	case "$expat" in
--	  yes)
-+	  yes|"")
- 		EXPAT_LIBS="-lexpat"
- 		;;
- 	    *)
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
deleted file mode 100644
index aca7c7d..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH(gconf-source, 
-  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH(gconf-schema-file-dir, 
-  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-     [  --disable-schemas-install	Disable the schemas installation],
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
deleted file mode 100644
index 8ee42c3..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Matchbox lightweight window manager"
-SECTION = "x11/wm"
-LICENSE = "GPLv2.0+"
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat"
-PR = "r5"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \
-           file://configure_fix.patch \
-           file://kbdconfig \
-           file://gconf-2.m4"
-
-SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb"
-SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff"
-
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* \
-	       ${datadir}/matchbox \
-	       ${sysconfdir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/Default/matchbox \
-	       ${datadir}/themes/MBOpus/matchbox"
-
-EXTRA_OECONF = " --enable-startup-notification \
-                 --disable-xrm \
-                 --enable-expat \
-                 --with-expat-lib=${STAGING_LIBDIR} \
-                 --with-expat-includes=${STAGING_INCDIR}"
-
-
-do_configure_prepend () {
-        cp ${WORKDIR}/gconf-2.m4 ${S}/
-}
-
-do_install_prepend() {
-	install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
-}
-- 
1.7.9.5




More information about the Openembedded-core mailing list