From ebce91a9a86fe3e63561734ff902fc51f478e08c Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 26 Oct 2018 15:07:33 +0200 Subject: buildsys: properly disable qglsa applet --- .depend | 2 +- Makefile.am | 3 +++ applets.h | 4 +++- include_applets.h | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.depend b/.depend index 5de684d2..f8239236 100644 --- a/.depend +++ b/.depend @@ -7,4 +7,4 @@ main.o: main.c porting.h main.h libq/libq.c libq/busybox.h libq/i18n.h \ libq/prelink.c libq/profile.c libq/vdb.c libq/vdb_get_next_dir.c \ libq/virtuals.c applets.h include_applets.h q.c qcheck.c qdepends.c \ qfile.c qlist.c qlop.c qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c \ - qgrep.c qatom.c qmerge.c qcache.c qglsa.c qtegrity.c + qgrep.c qatom.c qmerge.c qcache.c qtegrity.c diff --git a/Makefile.am b/Makefile.am index 425a0181..db208798 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,6 +76,7 @@ dist_man_MANS += \ man/qsearch.1 \ man/qsize.1 \ man/qtbz2.1 \ + man/qtegrity.1 \ man/quse.1 \ man/qxpak.1 APPLETS += \ @@ -164,6 +165,8 @@ EXTRA_DIST += \ tests/atom_explode/basic.good \ tests/atom_explode/basic.tests \ tests/atom_explode/dotest \ + tests/atom_explode/ebuildlist.xz \ + tests/atom_explode/portageatoms.xz \ tests/atom_explode/test.c \ tests/copy_file/.gitignore \ tests/copy_file/Makefile \ diff --git a/applets.h b/applets.h index daf70476..14b01547 100644 --- a/applets.h +++ b/applets.h @@ -30,7 +30,7 @@ DECLARE_APPLET(qgrep) DECLARE_APPLET(qatom) DECLARE_APPLET(qmerge) DECLARE_APPLET(qcache) -DECLARE_APPLET(qglsa) /* disable */ +/*DECLARE_APPLET(qglsa) disable */ DECLARE_APPLET(qtegrity) #undef DECLARE_APPLET @@ -52,7 +52,9 @@ static const struct applet_t { {"qcheck", qcheck_main, "", "verify integrity of installed packages"}, {"qdepends", qdepends_main, "", "show dependency info"}, {"qfile", qfile_main, "", "list all pkgs owning files"}, + /* {"qglsa", qglsa_main, " ", "check GLSAs against system"}, + */ {"qgrep", qgrep_main, "", "grep in ebuilds"}, {"qlist", qlist_main, "", "list files owned by pkgname"}, {"qlop", qlop_main, "", "emerge log analyzer"}, diff --git a/include_applets.h b/include_applets.h index 6ff8f8a7..916e5f75 100644 --- a/include_applets.h +++ b/include_applets.h @@ -14,5 +14,4 @@ #include "qatom.c" #include "qmerge.c" #include "qcache.c" -#include "qglsa.c" #include "qtegrity.c" -- cgit v1.2.3-65-gdbad