From f4ebb4ec4ae57c6ed4209f9b8e9dc37515fd4e85 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 13 Jul 2017 17:54:25 +0200 Subject: [PATCH 01/10] and downsize... --- system-tools.yaml | 92 ++++------------------------------------------- 1 file changed, 7 insertions(+), 85 deletions(-) diff --git a/system-tools.yaml b/system-tools.yaml index a42be9c..b66f997 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -18,6 +18,8 @@ data: common-build-dependencies: f26 shared-userspace: f26 perl: f26 + # ouch, needed for nano (groff and deps) + bootstrap: f26 requires: base-runtime: f26 shared-userspace: f26 @@ -28,39 +30,19 @@ data: profiles: default: rpms: - - iproute - - iputils - - less - - procps-ng + - calc + - dateutils + - gcal + - nano filter: rpms: - - emacs - - emacs-terminal - - nmap-frontend - - pam_ssh_agent_auth - - vim-X11 - - wireshark-gnome - - wireshark-devel + - calc-devel api: rpms: - calc - dateutils - gcal - - htop - - iotop - - iproute - - iputils - - joe - - less - - vim-minimal - - emacs-nox - nano - - nmap - - nmap-ncat - - rdiff-backup - - screen - - tmux - - wireshark components: rpms: calc: @@ -69,69 +51,9 @@ data: dateutils: rationale: command-line date and time math. ref: f26 - emacs: - rationale: necessary for editor wars. - ref: f26 gcal: rationale: better command-line calendar utility. ref: f26 - hostname: - rationale: provides hostname command(s); may later be removed. - ref: f26 - htop: - rationale: popular alternative process monitoring tool. - ref: f26 - iotop: - rationale: basic diagnostic tool. - ref: f26 - iproute: - rationale: provides common network commands like ip. - ref: f26 - iputils: - rationale: provides common network commands like ping. - ref: f26 - joe: - rationale: not necessary for editor wars at all but here it is anyway. - ref: f26 - procps-ng: - rationale: provides common system tools like ps. - ref: f26 - less: - rationale: provides less. - ref: f26 nano: rationale: like Canada for editor wars. ref: f26 - nmap: - rationale: network diagnostic tool + also netcat. - ref: f26 - rdiff-backup: - rationale: incremental backup and mirror utility. - ref: f26 - screen: - rationale: for the screen vs. tmux wars. - ref: f26 - tmux: - rationale: for the screen vs. tmux wars. - ref: f26 - vim: - rationale: necessary for editor wars. - ref: f26 - wireshark: - rationale: network traffic analyzer. - ref: f26 - bash: - rationale: required for wireshark. - ref: f26 - krb5: - rationale: required for wireshark. - ref: f26 - zlib: - rationale: required for wireshark. - ref: f26 - GeoIP: - rationale: required for wireshark. - ref: f26 - ncurses: - rationale: required for vim-minimal & emacs. - ref: f26 From 660cf99c3d53843274f29c0f4a9f672c770fe284 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 13 Jul 2017 17:55:48 +0200 Subject: [PATCH 02/10] we use bootstrap again (for nano -> groff) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2de8a21..b9b18b4 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ nowhere to get them from, hence the need for this module. |-------|-------------| | ✓ YES | **Build passes** in the infra (all build deps are ok) | | ✓ YES | **Installs** on the Base Runtime (all runtime deps are ok) | -| ✓ YES | **No bootstrap** - uses only proper modules | +| ✗ NO | **No bootstrap** - uses only proper modules | | ✓ YES | General **tests are in dist-git** | | ✓ YES | General **tests pass** | | ✗ NO | Meets the **Fedora Module Packaging Guidelines** | From ca39665b57dc6b572ecf01bf3ec9143cedc0fd70 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 13 Jul 2017 19:26:27 +0200 Subject: [PATCH 03/10] disable base-runtime (clashes with bootstrap) --- system-tools.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system-tools.yaml b/system-tools.yaml index b66f997..f8ffe82 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -14,7 +14,8 @@ data: - MIT dependencies: buildrequires: - base-runtime: f26 + # clashes with bootstrap + # base-runtime: f26 common-build-dependencies: f26 shared-userspace: f26 perl: f26 From 40df1c59b5066ebe2cb47372ca539ee941b62fab Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 20 Nov 2017 13:05:50 +0100 Subject: [PATCH 04/10] update dependencies --- system-tools.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/system-tools.yaml b/system-tools.yaml index a42be9c..327598e 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -14,13 +14,9 @@ data: - MIT dependencies: buildrequires: - base-runtime: f26 - common-build-dependencies: f26 - shared-userspace: f26 - perl: f26 + bootstrap: master requires: - base-runtime: f26 - shared-userspace: f26 + platform: master references: community: https://fedoraproject.org/wiki/Modularity documentation: https://github.com/modularity-modules/system-tools From 875266e366cf4f41729288083eda4b0b3211081c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 20 Nov 2017 13:06:16 +0100 Subject: [PATCH 05/10] update references --- system-tools.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system-tools.yaml b/system-tools.yaml index 327598e..a69a689 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -18,8 +18,7 @@ data: requires: platform: master references: - community: https://fedoraproject.org/wiki/Modularity - documentation: https://github.com/modularity-modules/system-tools + community: https://docs.pagure.org/modularity/ tracker: https://github.com/modularity-modules/system-tools profiles: default: From 9fba21e0e791e54fbcf4d0943ed6559d863563e1 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 20 Nov 2017 13:07:51 +0100 Subject: [PATCH 06/10] sync components, api, ... with released branches --- system-tools.yaml | 93 ++--------------------------------------------- 1 file changed, 4 insertions(+), 89 deletions(-) diff --git a/system-tools.yaml b/system-tools.yaml index a69a689..347ef70 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -23,39 +23,17 @@ data: profiles: default: rpms: - - iproute - - iputils - - less - - procps-ng + - calc + - dateutils + - gcal filter: rpms: - - emacs - - emacs-terminal - - nmap-frontend - - pam_ssh_agent_auth - - vim-X11 - - wireshark-gnome - - wireshark-devel + - calc-devel api: rpms: - calc - dateutils - gcal - - htop - - iotop - - iproute - - iputils - - joe - - less - - vim-minimal - - emacs-nox - - nano - - nmap - - nmap-ncat - - rdiff-backup - - screen - - tmux - - wireshark components: rpms: calc: @@ -64,69 +42,6 @@ data: dateutils: rationale: command-line date and time math. ref: f26 - emacs: - rationale: necessary for editor wars. - ref: f26 gcal: rationale: better command-line calendar utility. ref: f26 - hostname: - rationale: provides hostname command(s); may later be removed. - ref: f26 - htop: - rationale: popular alternative process monitoring tool. - ref: f26 - iotop: - rationale: basic diagnostic tool. - ref: f26 - iproute: - rationale: provides common network commands like ip. - ref: f26 - iputils: - rationale: provides common network commands like ping. - ref: f26 - joe: - rationale: not necessary for editor wars at all but here it is anyway. - ref: f26 - procps-ng: - rationale: provides common system tools like ps. - ref: f26 - less: - rationale: provides less. - ref: f26 - nano: - rationale: like Canada for editor wars. - ref: f26 - nmap: - rationale: network diagnostic tool + also netcat. - ref: f26 - rdiff-backup: - rationale: incremental backup and mirror utility. - ref: f26 - screen: - rationale: for the screen vs. tmux wars. - ref: f26 - tmux: - rationale: for the screen vs. tmux wars. - ref: f26 - vim: - rationale: necessary for editor wars. - ref: f26 - wireshark: - rationale: network traffic analyzer. - ref: f26 - bash: - rationale: required for wireshark. - ref: f26 - krb5: - rationale: required for wireshark. - ref: f26 - zlib: - rationale: required for wireshark. - ref: f26 - GeoIP: - rationale: required for wireshark. - ref: f26 - ncurses: - rationale: required for vim-minimal & emacs. - ref: f26 From e1d6e179a3bad55f1b2c31079f6fb557f4fb0837 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 20 Nov 2017 13:08:11 +0100 Subject: [PATCH 07/10] update components to master branch --- system-tools.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system-tools.yaml b/system-tools.yaml index 347ef70..d50e378 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -38,10 +38,10 @@ data: rpms: calc: rationale: command-line calculator. - ref: f26 + ref: master dateutils: rationale: command-line date and time math. - ref: f26 + ref: master gcal: rationale: better command-line calendar utility. - ref: f26 + ref: master From 5ddb9b64f2d094640068c1cdf5673f28b6c3dbc7 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 20 Nov 2017 13:16:47 +0100 Subject: [PATCH 08/10] make rationales nicer --- system-tools.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system-tools.yaml b/system-tools.yaml index d50e378..82ae7a8 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -37,11 +37,11 @@ data: components: rpms: calc: - rationale: command-line calculator. + rationale: A command-line calculator. ref: master dateutils: - rationale: command-line date and time math. + rationale: A command-line utility for date and time calculation. ref: master gcal: - rationale: better command-line calendar utility. + rationale: A command-line calendar utility. ref: master From 4a39d22c64e6bad00796d69e0b64b99f5a9e9c0c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 20 Nov 2017 13:17:01 +0100 Subject: [PATCH 09/10] add mlocate --- system-tools.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system-tools.yaml b/system-tools.yaml index 82ae7a8..c3b4d3a 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -26,6 +26,7 @@ data: - calc - dateutils - gcal + - mlocate filter: rpms: - calc-devel @@ -34,6 +35,7 @@ data: - calc - dateutils - gcal + - mlocate components: rpms: calc: @@ -45,3 +47,6 @@ data: gcal: rationale: A command-line calendar utility. ref: master + mlocate: + rationale: A utility for finding files. + ref: master From 79cdcf65afd08ca5b683fbd9e9b95bf74860f923 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 20 Nov 2017 15:26:22 +0100 Subject: [PATCH 10/10] add screen --- system-tools.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system-tools.yaml b/system-tools.yaml index c3b4d3a..b582091 100644 --- a/system-tools.yaml +++ b/system-tools.yaml @@ -27,6 +27,7 @@ data: - dateutils - gcal - mlocate + - screen filter: rpms: - calc-devel @@ -36,6 +37,7 @@ data: - dateutils - gcal - mlocate + - screen components: rpms: calc: @@ -50,3 +52,6 @@ data: mlocate: rationale: A utility for finding files. ref: master + screen: + rationale: A screen manager supporting multiple logins on one terminal. + ref: master