diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch b/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch new file mode 100644 index 000000000..676795dc8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch @@ -0,0 +1,58 @@ +[PATCH] disable test + +Upstream-Status: Inappropriate [configuration] + +test needs gtest package, so not build the test dir + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + Makefile | 7 +++---- + configure.ac | 6 ------ + 2 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 5f5fb27..5070e96 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,8 +9,8 @@ endif + .PHONY: default + default: startup all + +-.PHONY: headers library clean veryclean all binary program doc test update-po +-all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs: ++.PHONY: headers library clean veryclean all binary program doc update-po ++all headers library clean veryclean binary program doc manpages docbook update-po startup dirs: + $(MAKE) -C vendor $@ + $(MAKE) -C apt-pkg $@ + $(MAKE) -C apt-inst $@ +@@ -21,9 +21,8 @@ all headers library clean veryclean binary program doc manpages docbook test upd + $(MAKE) -C dselect $@ + # $(MAKE) -C doc $@ + $(MAKE) -C po $@ +- $(MAKE) -C test $@ + +-all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs ++all headers library clean veryclean binary program doc manpages docbook update-po: startup dirs + + dirs: startup + +diff --git a/configure.ac b/configure.ac +index 5663aaf..b0f9564 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,12 +89,6 @@ AC_CHECK_LIB(curl, curl_easy_init, + AC_MSG_ERROR([failed: I need CURL due https support]), + ) + +-AC_LANG_PUSH([C++]) +-AC_CHECK_HEADER(gtest/gtest.h,, +- AC_MSG_ERROR([failed: I need gtest to build tests]), +-) +-AC_LANG_POP([C++]) +- + + AC_SUBST(BDBLIB) + +-- +1.9.1 + |
