* [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/vanilla/linux/uclibc/amd64/, profiles/vanilla/linux/uclibc/x86/, ...
@ 2012-01-06 14:55 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-01-06 14:55 UTC (permalink / raw
To: gentoo-commits
commit: cad7e4768418b68f08931633455b155d270af4a7
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 6 14:55:43 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jan 6 14:55:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=cad7e476
Removed masking on readline
---
profiles/hardened/linux/uclibc/x86/package.mask | 1 -
profiles/vanilla/linux/uclibc/amd64/package.mask | 1 -
profiles/vanilla/linux/uclibc/x86/package.mask | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/profiles/hardened/linux/uclibc/x86/package.mask b/profiles/hardened/linux/uclibc/x86/package.mask
index 3603b8a..208eaec 100644
--- a/profiles/hardened/linux/uclibc/x86/package.mask
+++ b/profiles/hardened/linux/uclibc/x86/package.mask
@@ -1,4 +1,3 @@
>sys-apps/util-linux-2.18-r1
>sys-fs/udev-141
->sys-libs/readline-5.2_p14
>sys-libs/pam-1.1.2
diff --git a/profiles/vanilla/linux/uclibc/amd64/package.mask b/profiles/vanilla/linux/uclibc/amd64/package.mask
index 414bc48..d372897 100644
--- a/profiles/vanilla/linux/uclibc/amd64/package.mask
+++ b/profiles/vanilla/linux/uclibc/amd64/package.mask
@@ -1,3 +1,2 @@
>sys-apps/util-linux-2.18-r1
>sys-fs/udev-141
->sys-libs/readline-5.2_p14
diff --git a/profiles/vanilla/linux/uclibc/x86/package.mask b/profiles/vanilla/linux/uclibc/x86/package.mask
index 414bc48..d372897 100644
--- a/profiles/vanilla/linux/uclibc/x86/package.mask
+++ b/profiles/vanilla/linux/uclibc/x86/package.mask
@@ -1,3 +1,2 @@
>sys-apps/util-linux-2.18-r1
>sys-fs/udev-141
->sys-libs/readline-5.2_p14
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/vanilla/linux/uclibc/amd64/, profiles/vanilla/linux/uclibc/x86/, ...
@ 2012-01-16 16:39 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-01-16 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 9c9997cedca8c4e0a7cd27deef6997867dfb6a88
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 16:39:11 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 16:39:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=9c9997ce
profiles: consolidate vanilla x86 and amd64 to parent
---
profiles/vanilla/linux/uclibc/amd64/make.defaults | 3 ---
profiles/vanilla/linux/uclibc/amd64/package.mask | 1 -
.../vanilla/linux/uclibc/amd64/package.use.mask | 1 -
profiles/vanilla/linux/uclibc/make.defaults | 4 +---
.../uclibc/{amd64 => }/package.accept_keywords | 0
profiles/vanilla/linux/uclibc/package.mask | 3 +++
.../linux/uclibc/{x86 => }/package.use.mask | 0
profiles/vanilla/linux/uclibc/x86/make.defaults | 3 ---
.../linux/uclibc/x86/package.accept_keywords | 4 ----
profiles/vanilla/linux/uclibc/x86/package.mask | 2 --
10 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/profiles/vanilla/linux/uclibc/amd64/make.defaults b/profiles/vanilla/linux/uclibc/amd64/make.defaults
index 06c7995..c4a8a7b 100644
--- a/profiles/vanilla/linux/uclibc/amd64/make.defaults
+++ b/profiles/vanilla/linux/uclibc/amd64/make.defaults
@@ -1,6 +1,3 @@
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
CHOST="x86_64-gentoo-linux-uclibc"
-
-USE="ncurses pic readline uclibc zlib"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} pic"
diff --git a/profiles/vanilla/linux/uclibc/amd64/package.mask b/profiles/vanilla/linux/uclibc/amd64/package.mask
deleted file mode 100644
index 9298f3b..0000000
--- a/profiles/vanilla/linux/uclibc/amd64/package.mask
+++ /dev/null
@@ -1 +0,0 @@
->sys-fs/udev-141
diff --git a/profiles/vanilla/linux/uclibc/amd64/package.use.mask b/profiles/vanilla/linux/uclibc/amd64/package.use.mask
deleted file mode 100644
index 0388180..0000000
--- a/profiles/vanilla/linux/uclibc/amd64/package.use.mask
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/iputils ipv6
diff --git a/profiles/vanilla/linux/uclibc/make.defaults b/profiles/vanilla/linux/uclibc/make.defaults
index 069f068..9cc77af 100644
--- a/profiles/vanilla/linux/uclibc/make.defaults
+++ b/profiles/vanilla/linux/uclibc/make.defaults
@@ -3,6 +3,4 @@ CXXFLAGS="${CFLAGS}"
PORTAGE_LIBC="uClibc"
ELIBC=uclibc
FEATURES="sandbox sfperms strict"
-
-USE="ncurses nptl readline uclibc unicode xattr zlib -pam"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
+USE="ncurses nptl pic readline uclibc unicode xattr zlib -pam"
diff --git a/profiles/vanilla/linux/uclibc/amd64/package.accept_keywords b/profiles/vanilla/linux/uclibc/package.accept_keywords
similarity index 100%
rename from profiles/vanilla/linux/uclibc/amd64/package.accept_keywords
rename to profiles/vanilla/linux/uclibc/package.accept_keywords
diff --git a/profiles/vanilla/linux/uclibc/package.mask b/profiles/vanilla/linux/uclibc/package.mask
index be69761..81ab164 100644
--- a/profiles/vanilla/linux/uclibc/package.mask
+++ b/profiles/vanilla/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/vanilla/linux/uclibc/x86/package.use.mask b/profiles/vanilla/linux/uclibc/package.use.mask
similarity index 100%
rename from profiles/vanilla/linux/uclibc/x86/package.use.mask
rename to profiles/vanilla/linux/uclibc/package.use.mask
diff --git a/profiles/vanilla/linux/uclibc/x86/make.defaults b/profiles/vanilla/linux/uclibc/x86/make.defaults
index c540700..fa5e874 100644
--- a/profiles/vanilla/linux/uclibc/x86/make.defaults
+++ b/profiles/vanilla/linux/uclibc/x86/make.defaults
@@ -1,6 +1,3 @@
ARCH="x86"
ACCEPT_KEYWORDS="x86"
CHOST="i386-gentoo-linux-uclibc"
-
-USE="ncurses pic readline uclibc zlib"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} pic"
diff --git a/profiles/vanilla/linux/uclibc/x86/package.accept_keywords b/profiles/vanilla/linux/uclibc/x86/package.accept_keywords
deleted file mode 100644
index 81cac73..0000000
--- a/profiles/vanilla/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/vanilla/linux/uclibc/x86/package.mask b/profiles/vanilla/linux/uclibc/x86/package.mask
deleted file mode 100644
index 4f427dd..0000000
--- a/profiles/vanilla/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] 2+ messages in thread
end of thread, other threads:[~2012-01-16 16:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-06 14:55 [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/vanilla/linux/uclibc/amd64/, profiles/vanilla/linux/uclibc/x86/, Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-01-16 16:39 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