| 1 |
commit: ebce91a9a86fe3e63561734ff902fc51f478e08c |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 26 13:07:33 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 26 13:07:33 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ebce91a9 |
| 7 |
|
| 8 |
buildsys: properly disable qglsa applet |
| 9 |
|
| 10 |
.depend | 2 +- |
| 11 |
Makefile.am | 3 +++ |
| 12 |
applets.h | 4 +++- |
| 13 |
include_applets.h | 1 - |
| 14 |
4 files changed, 7 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/.depend b/.depend |
| 17 |
index 5de684d..f823923 100644 |
| 18 |
--- a/.depend |
| 19 |
+++ b/.depend |
| 20 |
@@ -7,4 +7,4 @@ main.o: main.c porting.h main.h libq/libq.c libq/busybox.h libq/i18n.h \ |
| 21 |
libq/prelink.c libq/profile.c libq/vdb.c libq/vdb_get_next_dir.c \ |
| 22 |
libq/virtuals.c applets.h include_applets.h q.c qcheck.c qdepends.c \ |
| 23 |
qfile.c qlist.c qlop.c qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c \ |
| 24 |
- qgrep.c qatom.c qmerge.c qcache.c qglsa.c qtegrity.c |
| 25 |
+ qgrep.c qatom.c qmerge.c qcache.c qtegrity.c |
| 26 |
|
| 27 |
diff --git a/Makefile.am b/Makefile.am |
| 28 |
index 425a018..db20879 100644 |
| 29 |
--- a/Makefile.am |
| 30 |
+++ b/Makefile.am |
| 31 |
@@ -76,6 +76,7 @@ dist_man_MANS += \ |
| 32 |
man/qsearch.1 \ |
| 33 |
man/qsize.1 \ |
| 34 |
man/qtbz2.1 \ |
| 35 |
+ man/qtegrity.1 \ |
| 36 |
man/quse.1 \ |
| 37 |
man/qxpak.1 |
| 38 |
APPLETS += \ |
| 39 |
@@ -164,6 +165,8 @@ EXTRA_DIST += \ |
| 40 |
tests/atom_explode/basic.good \ |
| 41 |
tests/atom_explode/basic.tests \ |
| 42 |
tests/atom_explode/dotest \ |
| 43 |
+ tests/atom_explode/ebuildlist.xz \ |
| 44 |
+ tests/atom_explode/portageatoms.xz \ |
| 45 |
tests/atom_explode/test.c \ |
| 46 |
tests/copy_file/.gitignore \ |
| 47 |
tests/copy_file/Makefile \ |
| 48 |
|
| 49 |
diff --git a/applets.h b/applets.h |
| 50 |
index daf7047..14b0154 100644 |
| 51 |
--- a/applets.h |
| 52 |
+++ b/applets.h |
| 53 |
@@ -30,7 +30,7 @@ DECLARE_APPLET(qgrep) |
| 54 |
DECLARE_APPLET(qatom) |
| 55 |
DECLARE_APPLET(qmerge) |
| 56 |
DECLARE_APPLET(qcache) |
| 57 |
-DECLARE_APPLET(qglsa) /* disable */ |
| 58 |
+/*DECLARE_APPLET(qglsa) disable */ |
| 59 |
DECLARE_APPLET(qtegrity) |
| 60 |
#undef DECLARE_APPLET |
| 61 |
|
| 62 |
@@ -52,7 +52,9 @@ static const struct applet_t { |
| 63 |
{"qcheck", qcheck_main, "<pkgname>", "verify integrity of installed packages"}, |
| 64 |
{"qdepends", qdepends_main, "<pkgname>", "show dependency info"}, |
| 65 |
{"qfile", qfile_main, "<filename>", "list all pkgs owning files"}, |
| 66 |
+ /* |
| 67 |
{"qglsa", qglsa_main, "<action> <list>", "check GLSAs against system"}, |
| 68 |
+ */ |
| 69 |
{"qgrep", qgrep_main, "<misc args>", "grep in ebuilds"}, |
| 70 |
{"qlist", qlist_main, "<pkgname>", "list files owned by pkgname"}, |
| 71 |
{"qlop", qlop_main, "<pkgname>", "emerge log analyzer"}, |
| 72 |
|
| 73 |
diff --git a/include_applets.h b/include_applets.h |
| 74 |
index 6ff8f8a..916e5f7 100644 |
| 75 |
--- a/include_applets.h |
| 76 |
+++ b/include_applets.h |
| 77 |
@@ -14,5 +14,4 @@ |
| 78 |
#include "qatom.c" |
| 79 |
#include "qmerge.c" |
| 80 |
#include "qcache.c" |
| 81 |
-#include "qglsa.c" |
| 82 |
#include "qtegrity.c" |
Archives