Skip to contentSkip to conversation

Clean up my check mess

PATCH New Saul Wold 1 participant 4 messages Oct 21, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Clean up my check mess

Richard,

A small set of patches that remove my bogus check recipe. It adds native support to libcheck since kbd needs it for it's testing.

Sau!

Saul Wold (3):
libcheck: Add native support for kbd-native
kbd: Use libcheck instead of check
check: Remove duplicate recipe of libcheck

 meta/recipes-core/kbd/kbd_2.0.0.bb               |  2 +-
 meta/recipes-support/check/check_0.9.10.bb       | 20 ----------------
 meta/recipes-support/check/files/ptest.patch     | 29 ------------------------
 meta/recipes-support/check/files/run-ptest       |  3 ---
 meta/recipes-support/libcheck/libcheck_0.9.10.bb |  3 +++
 5 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 meta/recipes-support/check/check_0.9.10.bb
 delete mode 100644 meta/recipes-support/check/files/ptest.patch
 delete mode 100644 meta/recipes-support/check/files/run-ptest
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH 1/3 libcheck: Add native support for kbd-native

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-support/libcheck/libcheck_0.9.10.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-support/libcheck/libcheck_0.9.10.bb +3 -0
index a22271a..2cadf67 100644
@@ -20,3 +20,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk"
 
 RREPLACES_${PN} = "check (<= 0.9.5)"
 RDEPENDS_${PN} += "gawk"
+RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native"
Signature · 1 line
1.8.3.1
author
#2 lore raw

PATCH 2/3 kbd: Use libcheck instead of check

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-core/kbd/kbd_2.0.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/kbd/kbd_2.0.0.bb +1 -1
index eafa0b0..e66018f 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "This package contains keytable files and keyboard utilities"
 # everything minus console-fonts is GPLv2+
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5"
-DEPENDS = "check"
+DEPENDS = "libcheck"
 
 inherit autotools gettext ptest
Signature · 1 line
1.8.3.1
author
#3 lore raw

PATCH 3/3 check: Remove duplicate recipe of libcheck

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-support/check/check_0.9.10.bb   | 20 -------------------
 meta/recipes-support/check/files/ptest.patch | 29 ----------------------------
 meta/recipes-support/check/files/run-ptest   |  3 ---
 3 files changed, 52 deletions(-)
 delete mode 100644 meta/recipes-support/check/check_0.9.10.bb
 delete mode 100644 meta/recipes-support/check/files/ptest.patch
 delete mode 100644 meta/recipes-support/check/files/run-ptest
meta/recipes-support/check/check_0.9.10.bb deleted +0 -20
deleted file mode 100644
index 78eec14..0000000
@@ -1,20 +0,0 @@
-DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures"
-HOMEPAGE = "http://sourceforge.net/projects/check"
-SECTION = "libs"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
-           file://run-ptest \
-           file://ptest.patch \
-          "
-
-SRC_URI[md5sum] = "6d10a8efb9a683467b92b3bce97aeb30"
-SRC_URI[sha256sum] = "823819235753e94ae0bcab3c46cc209de166c32ff2f52cefe120597db4403e6d"
-
-inherit autotools ptest
-
-RDEPENDS_${PN} = "make"
-
-BBCLASSEXTEND = "native"
meta/recipes-support/check/files/ptest.patch deleted +0 -29
deleted file mode 100644
index 3cb2b25..0000000
@@ -1,29 +0,0 @@
-Index: check-0.9.10/Makefile.am
-===================================================================
---- check-0.9.10.orig/Makefile.am
-+++ check-0.9.10/Makefile.am
-@@ -45,6 +45,9 @@ ACLOCAL_AMFLAGS = -I m4
- doc/check_html:
- 	$(MAKE) -C doc check_html
- 
-+install-ptest:
-+	$(MAKE) -C tests install-ptest
-+
- # check we can do a clean build, including docs.
- # perhaps we should check for out of date (svn st -u) and modified files.
- prereleasecheck: doc/check_html
-Index: check-0.9.10/tests/Makefile.am
-===================================================================
---- check-0.9.10.orig/tests/Makefile.am
-+++ check-0.9.10/tests/Makefile.am
-@@ -81,3 +81,10 @@ ex_xml_output_LDADD = $(top_builddir)/sr
- AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
- 
- CLEANFILES = *~ *.log *.xml test_logfile
-+
-+install-ptest:
-+	@$(MKDIR_P) $(DESTDIR)/tests
-+	@for file in $(noinst_PROGRAMS) $(EXTRA_DIST); do \
-+		install -m 0755 $$file $(DESTDIR)/tests; \
-+	done;
-+	@sed -e 's/^Makefile/_Makefile/' < Makefile > $(DESTDIR)/Makefile
meta/recipes-support/check/files/run-ptest deleted +0 -3
deleted file mode 100644
index d4969ef..0000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-make -k check-TESTS
-
Signature · 1 line
1.8.3.1