aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2020-01-06 09:08:03 -0600
committerBen Kohler <bkohler@gentoo.org>2020-01-06 09:08:03 -0600
commitb202848501b8b5acf5fa5f1bbe6da1d7f0da802a (patch)
tree6fcb09d9904a5c48a6928998c4e8c511daf28f7b
parentspecs/ppc: Drop --arch-override=ppc argument to genkernel (diff)
downloadreleng-b202848501b8b5acf5fa5f1bbe6da1d7f0da802a.tar.gz
releng-b202848501b8b5acf5fa5f1bbe6da1d7f0da802a.tar.bz2
releng-b202848501b8b5acf5fa5f1bbe6da1d7f0da802a.zip
specs/{amd64,x86}: don't unmerge diffutils where colordiff needs it
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
-rw-r--r--releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec1
-rw-r--r--releases/weekly/specs/amd64/hardened/admincd-stage2.spec1
-rw-r--r--releases/weekly/specs/x86/hardened/admincd-stage2.spec1
3 files changed, 0 insertions, 3 deletions
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
index 30e4c078..9d00482c 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
@@ -39,7 +39,6 @@ livecd/unmerge:
perl-core/PodParser
perl-core/Test-Harness
sys-apps/debianutils
- sys-apps/diffutils
sys-apps/groff
sys-apps/man-db
sys-apps/man-pages
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 2154566f..6997f55a 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -39,7 +39,6 @@ livecd/unmerge:
perl-core/PodParser
perl-core/Test-Harness
sys-apps/debianutils
- sys-apps/diffutils
sys-apps/groff
sys-apps/man-db
sys-apps/man-pages
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index d08b17ec..b23d8d24 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -33,7 +33,6 @@ livecd/unmerge:
perl-core/PodParser
perl-core/Test-Harness
sys-apps/debianutils
- sys-apps/diffutils
sys-apps/groff
sys-apps/man-db
sys-apps/man-pages