* [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/hardened/linux/uclibc/amd64/, profiles/hardened/linux/uclibc/, ...
@ 2012-01-16 4:36 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-16 4:36 UTC (permalink / raw
To: gentoo-commits
commit: 59482cb332b70ea724e9d1fe53d0bd1e13c541b3
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 04:35:59 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 04:35:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=59482cb3
profiles: moved common USE flags to parent of amd64 and x86
---
profiles/hardened/linux/uclibc/amd64/make.defaults | 4 +---
profiles/hardened/linux/uclibc/make.defaults | 2 +-
profiles/hardened/linux/uclibc/x86/make.defaults | 4 +---
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/profiles/hardened/linux/uclibc/amd64/make.defaults b/profiles/hardened/linux/uclibc/amd64/make.defaults
index 06c7995..e30b842 100644
--- a/profiles/hardened/linux/uclibc/amd64/make.defaults
+++ b/profiles/hardened/linux/uclibc/amd64/make.defaults
@@ -1,6 +1,4 @@
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
CHOST="x86_64-gentoo-linux-uclibc"
-
-USE="ncurses pic readline uclibc zlib"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} pic"
+USE="pic"
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index 069f068..36dab83 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -4,5 +4,5 @@ PORTAGE_LIBC="uClibc"
ELIBC=uclibc
FEATURES="sandbox sfperms strict"
-USE="ncurses nptl readline uclibc unicode xattr zlib -pam"
+USE="hardened ncurses nptl readline uclibc unicode xattr zlib -pam"
BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
diff --git a/profiles/hardened/linux/uclibc/x86/make.defaults b/profiles/hardened/linux/uclibc/x86/make.defaults
index 48a2633..16d6e1b 100644
--- a/profiles/hardened/linux/uclibc/x86/make.defaults
+++ b/profiles/hardened/linux/uclibc/x86/make.defaults
@@ -1,6 +1,4 @@
ARCH="x86"
ACCEPT_KEYWORDS="x86"
CHOST="i386-gentoo-linux-uclibc"
-
-USE="hardened ncurses pic readline uclibc zlib"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
+USE="pic"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/hardened/linux/uclibc/amd64/, profiles/hardened/linux/uclibc/, ...
@ 2012-01-16 16:05 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-16 16:05 UTC (permalink / raw
To: gentoo-commits
commit: fa17e0eb3f30bc987f8c1b80ba4ba136817d9711
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 16:05:43 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 16:05:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=fa17e0eb
profiles: consolidate hardened x86 and amd64 to parent
---
profiles/hardened/linux/uclibc/amd64/package.mask | 1 -
.../hardened/linux/uclibc/amd64/package.use.mask | 1 -
profiles/hardened/linux/uclibc/make.defaults | 2 --
.../uclibc/{amd64 => }/package.accept_keywords | 0
profiles/hardened/linux/uclibc/package.mask | 4 ++--
.../linux/uclibc/{x86 => }/package.use.mask | 0
.../linux/uclibc/x86/package.accept_keywords | 4 ----
profiles/hardened/linux/uclibc/x86/package.mask | 2 --
8 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/profiles/hardened/linux/uclibc/amd64/package.mask b/profiles/hardened/linux/uclibc/amd64/package.mask
deleted file mode 100644
index 9298f3b..0000000
--- a/profiles/hardened/linux/uclibc/amd64/package.mask
+++ /dev/null
@@ -1 +0,0 @@
->sys-fs/udev-141
diff --git a/profiles/hardened/linux/uclibc/amd64/package.use.mask b/profiles/hardened/linux/uclibc/amd64/package.use.mask
deleted file mode 100644
index 0388180..0000000
--- a/profiles/hardened/linux/uclibc/amd64/package.use.mask
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/iputils ipv6
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index 36dab83..afc7994 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -3,6 +3,4 @@ CXXFLAGS="${CFLAGS}"
PORTAGE_LIBC="uClibc"
ELIBC=uclibc
FEATURES="sandbox sfperms strict"
-
USE="hardened ncurses nptl readline uclibc unicode xattr zlib -pam"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
diff --git a/profiles/hardened/linux/uclibc/amd64/package.accept_keywords b/profiles/hardened/linux/uclibc/package.accept_keywords
similarity index 100%
rename from profiles/hardened/linux/uclibc/amd64/package.accept_keywords
rename to profiles/hardened/linux/uclibc/package.accept_keywords
diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/hardened/linux/uclibc/package.mask
index be69761..4f427dd 100644
--- a/profiles/hardened/linux/uclibc/package.mask
+++ b/profiles/hardened/linux/uclibc/package.mask
@@ -1,2 +1,2 @@
--sys-libs/uclibc
-sys-libs/glibc
+>sys-fs/udev-141
+>sys-libs/pam-1.1.2
diff --git a/profiles/hardened/linux/uclibc/x86/package.use.mask b/profiles/hardened/linux/uclibc/package.use.mask
similarity index 100%
rename from profiles/hardened/linux/uclibc/x86/package.use.mask
rename to profiles/hardened/linux/uclibc/package.use.mask
diff --git a/profiles/hardened/linux/uclibc/x86/package.accept_keywords b/profiles/hardened/linux/uclibc/x86/package.accept_keywords
deleted file mode 100644
index 81cac73..0000000
--- a/profiles/hardened/linux/uclibc/x86/package.accept_keywords
+++ /dev/null
@@ -1,4 +0,0 @@
-dev-libs/glib
-dev-libs/libiconv **
-sys-kernel/linux-headers
-sys-devel/gettext
diff --git a/profiles/hardened/linux/uclibc/x86/package.mask b/profiles/hardened/linux/uclibc/x86/package.mask
deleted file mode 100644
index 4f427dd..0000000
--- a/profiles/hardened/linux/uclibc/x86/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
->sys-fs/udev-141
->sys-libs/pam-1.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/hardened/linux/uclibc/amd64/, profiles/hardened/linux/uclibc/, ...
@ 2012-01-16 16:16 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-16 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 7a376ccc67f37dbc4ef608d61655bd01040f5cde
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 16:16:10 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 16:16:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=7a376ccc
Revert "profiles: consolidate hardened x86 and amd64 to parent"
This reverts commit fa17e0eb3f30bc987f8c1b80ba4ba136817d9711.
---
.../uclibc/{ => amd64}/package.accept_keywords | 0
profiles/hardened/linux/uclibc/amd64/package.mask | 1 +
.../linux/uclibc/{ => amd64}/package.use.mask | 1 -
profiles/hardened/linux/uclibc/make.defaults | 2 ++
profiles/hardened/linux/uclibc/package.mask | 4 ++--
.../linux/uclibc/{ => x86}/package.accept_keywords | 0
.../hardened/linux/uclibc/{ => x86}/package.mask | 0
.../linux/uclibc/{ => x86}/package.use.mask | 0
8 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/profiles/hardened/linux/uclibc/package.accept_keywords b/profiles/hardened/linux/uclibc/amd64/package.accept_keywords
similarity index 100%
copy from profiles/hardened/linux/uclibc/package.accept_keywords
copy to profiles/hardened/linux/uclibc/amd64/package.accept_keywords
diff --git a/profiles/hardened/linux/uclibc/amd64/package.mask b/profiles/hardened/linux/uclibc/amd64/package.mask
new file mode 100644
index 0000000..9298f3b
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/amd64/package.mask
@@ -0,0 +1 @@
+>sys-fs/udev-141
diff --git a/profiles/hardened/linux/uclibc/package.use.mask b/profiles/hardened/linux/uclibc/amd64/package.use.mask
similarity index 51%
copy from profiles/hardened/linux/uclibc/package.use.mask
copy to profiles/hardened/linux/uclibc/amd64/package.use.mask
index 2d8b00f..0388180 100644
--- a/profiles/hardened/linux/uclibc/package.use.mask
+++ b/profiles/hardened/linux/uclibc/amd64/package.use.mask
@@ -1,2 +1 @@
net-misc/iputils ipv6
-net-misc/openssh pam
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index afc7994..36dab83 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -3,4 +3,6 @@ CXXFLAGS="${CFLAGS}"
PORTAGE_LIBC="uClibc"
ELIBC=uclibc
FEATURES="sandbox sfperms strict"
+
USE="hardened ncurses nptl readline uclibc unicode xattr zlib -pam"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/hardened/linux/uclibc/package.mask
index 4f427dd..be69761 100644
--- a/profiles/hardened/linux/uclibc/package.mask
+++ b/profiles/hardened/linux/uclibc/package.mask
@@ -1,2 +1,2 @@
->sys-fs/udev-141
->sys-libs/pam-1.1.2
+-sys-libs/uclibc
+sys-libs/glibc
diff --git a/profiles/hardened/linux/uclibc/package.accept_keywords b/profiles/hardened/linux/uclibc/x86/package.accept_keywords
similarity index 100%
rename from profiles/hardened/linux/uclibc/package.accept_keywords
rename to profiles/hardened/linux/uclibc/x86/package.accept_keywords
diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/hardened/linux/uclibc/x86/package.mask
similarity index 100%
copy from profiles/hardened/linux/uclibc/package.mask
copy to profiles/hardened/linux/uclibc/x86/package.mask
diff --git a/profiles/hardened/linux/uclibc/package.use.mask b/profiles/hardened/linux/uclibc/x86/package.use.mask
similarity index 100%
rename from profiles/hardened/linux/uclibc/package.use.mask
rename to profiles/hardened/linux/uclibc/x86/package.use.mask
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/hardened/linux/uclibc/amd64/, profiles/hardened/linux/uclibc/, ...
@ 2012-01-16 16:27 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2012-01-16 16:27 UTC (permalink / raw
To: gentoo-commits
commit: ec8992d6268f218a99742b237d4ff0220636b3c2
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 16:27:32 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 16:27:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=ec8992d6
profiles: consolidate hardened x86 and amd64 to parent
---
profiles/hardened/linux/uclibc/amd64/make.defaults | 1 -
profiles/hardened/linux/uclibc/amd64/package.mask | 1 -
.../hardened/linux/uclibc/amd64/package.use.mask | 1 -
profiles/hardened/linux/uclibc/make.defaults | 4 +---
.../uclibc/{amd64 => }/package.accept_keywords | 0
profiles/hardened/linux/uclibc/package.mask | 3 +++
.../linux/uclibc/{x86 => }/package.use.mask | 0
profiles/hardened/linux/uclibc/x86/make.defaults | 1 -
.../linux/uclibc/x86/package.accept_keywords | 4 ----
profiles/hardened/linux/uclibc/x86/package.mask | 2 --
10 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/profiles/hardened/linux/uclibc/amd64/make.defaults b/profiles/hardened/linux/uclibc/amd64/make.defaults
index e30b842..c4a8a7b 100644
--- a/profiles/hardened/linux/uclibc/amd64/make.defaults
+++ b/profiles/hardened/linux/uclibc/amd64/make.defaults
@@ -1,4 +1,3 @@
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
CHOST="x86_64-gentoo-linux-uclibc"
-USE="pic"
diff --git a/profiles/hardened/linux/uclibc/amd64/package.mask b/profiles/hardened/linux/uclibc/amd64/package.mask
deleted file mode 100644
index 9298f3b..0000000
--- a/profiles/hardened/linux/uclibc/amd64/package.mask
+++ /dev/null
@@ -1 +0,0 @@
->sys-fs/udev-141
diff --git a/profiles/hardened/linux/uclibc/amd64/package.use.mask b/profiles/hardened/linux/uclibc/amd64/package.use.mask
deleted file mode 100644
index 0388180..0000000
--- a/profiles/hardened/linux/uclibc/amd64/package.use.mask
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/iputils ipv6
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index 36dab83..3cc0723 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -3,6 +3,4 @@ CXXFLAGS="${CFLAGS}"
PORTAGE_LIBC="uClibc"
ELIBC=uclibc
FEATURES="sandbox sfperms strict"
-
-USE="hardened ncurses nptl readline uclibc unicode xattr zlib -pam"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
+USE="hardened ncurses nptl pic readline uclibc unicode xattr zlib -pam"
diff --git a/profiles/hardened/linux/uclibc/amd64/package.accept_keywords b/profiles/hardened/linux/uclibc/package.accept_keywords
similarity index 100%
rename from profiles/hardened/linux/uclibc/amd64/package.accept_keywords
rename to profiles/hardened/linux/uclibc/package.accept_keywords
diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/hardened/linux/uclibc/package.mask
index be69761..81ab164 100644
--- a/profiles/hardened/linux/uclibc/package.mask
+++ b/profiles/hardened/linux/uclibc/package.mask
@@ -1,2 +1,5 @@
-sys-libs/uclibc
sys-libs/glibc
+#
+>sys-fs/udev-141
+>sys-libs/pam-1.1.2
diff --git a/profiles/hardened/linux/uclibc/x86/package.use.mask b/profiles/hardened/linux/uclibc/package.use.mask
similarity index 100%
rename from profiles/hardened/linux/uclibc/x86/package.use.mask
rename to profiles/hardened/linux/uclibc/package.use.mask
diff --git a/profiles/hardened/linux/uclibc/x86/make.defaults b/profiles/hardened/linux/uclibc/x86/make.defaults
index 16d6e1b..fa5e874 100644
--- a/profiles/hardened/linux/uclibc/x86/make.defaults
+++ b/profiles/hardened/linux/uclibc/x86/make.defaults
@@ -1,4 +1,3 @@
ARCH="x86"
ACCEPT_KEYWORDS="x86"
CHOST="i386-gentoo-linux-uclibc"
-USE="pic"
diff --git a/profiles/hardened/linux/uclibc/x86/package.accept_keywords b/profiles/hardened/linux/uclibc/x86/package.accept_keywords
deleted file mode 100644
index 81cac73..0000000
--- a/profiles/hardened/linux/uclibc/x86/package.accept_keywords
+++ /dev/null
@@ -1,4 +0,0 @@
-dev-libs/glib
-dev-libs/libiconv **
-sys-kernel/linux-headers
-sys-devel/gettext
diff --git a/profiles/hardened/linux/uclibc/x86/package.mask b/profiles/hardened/linux/uclibc/x86/package.mask
deleted file mode 100644
index 4f427dd..0000000
--- a/profiles/hardened/linux/uclibc/x86/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
->sys-fs/udev-141
->sys-libs/pam-1.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-16 16:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-16 4:36 [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/hardened/linux/uclibc/amd64/, profiles/hardened/linux/uclibc/, Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-01-16 16:05 Anthony G. Basile
2012-01-16 16:16 Anthony G. Basile
2012-01-16 16:27 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox