tools-uclibc: improve template logic for mips32r2

34 files changed, 783 insertions, 58 deletions

diff --git a/tools-uclibc/portage.mips.hardened/env/coreutils.conf b/tools-uclibc/portage.mips32r2.hardened/env/coreutils.conf
index 518a258e..518a258e 100644
--- a/tools-uclibc/portage.mips.hardened/env/coreutils.conf
+++ b/tools-uclibc/portage.mips32r2.hardened/env/coreutils.conf
diff --git a/tools-uclibc/portage.mips.hardened/env/git.conf b/tools-uclibc/portage.mips32r2.hardened/env/git.conf
index 518a258e..518a258e 100644
--- a/tools-uclibc/portage.mips.hardened/env/git.conf
+++ b/tools-uclibc/portage.mips32r2.hardened/env/git.conf
diff --git a/tools-uclibc/portage.mips.hardened/package.accept_keywords b/tools-uclibc/portage.mips32r2.hardened/package.accept_keywords/eudev
index 44dd1626..9ad4c3a4 100644
--- a/tools-uclibc/portage.mips.hardened/package.accept_keywords
+++ b/tools-uclibc/portage.mips32r2.hardened/package.accept_keywords/eudev
@@ -1,2 +1 @@
-=sys-devel/gcc-4.6.3-r99 ~mips
 =sys-fs/eudev-1_beta4-r1 ~mips
diff --git a/tools-uclibc/portage.mips.vanilla/package.accept_keywords b/tools-uclibc/portage.mips32r2.hardened/package.accept_keywords/gcc
index 44dd1626..18235b71 100644
--- a/tools-uclibc/portage.mips.vanilla/package.accept_keywords
+++ b/tools-uclibc/portage.mips32r2.hardened/package.accept_keywords/gcc
@@ -1,2 +1 @@
 =sys-devel/gcc-4.6.3-r99 ~mips
-=sys-fs/eudev-1_beta4-r1 ~mips
diff --git a/tools-uclibc/portage.mips.hardened/package.env b/tools-uclibc/portage.mips32r2.hardened/package.env
index 73db8b38..73db8b38 100644
--- a/tools-uclibc/portage.mips.hardened/package.env
+++ b/tools-uclibc/portage.mips32r2.hardened/package.env
diff --git a/tools-uclibc/portage.mips.hardened/package.mask b/tools-uclibc/portage.mips32r2.hardened/package.mask/gcc
index 1f114f43..f9876199 100644
--- a/tools-uclibc/portage.mips.hardened/package.mask
+++ b/tools-uclibc/portage.mips32r2.hardened/package.mask/gcc
@@ -1,3 +1,2 @@
 =sys-devel/gcc-4.7*
 =sys-devel/gcc-4.8*
-sys-fs/udev
diff --git a/tools-uclibc/portage.mips32r2.hardened/package.mask/udev b/tools-uclibc/portage.mips32r2.hardened/package.mask/udev
new file mode 100644
index 00000000..729aaa5c
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/package.mask/udev
@@ -0,0 +1 @@
+sys-fs/udev
diff --git a/tools-uclibc/portage.mips.hardened/package.use b/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc
index 0715d0b5..0715d0b5 100644
--- a/tools-uclibc/portage.mips.hardened/package.use
+++ b/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc
diff --git a/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
new file mode 100644
index 00000000..cfc64de4
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/00_fix-eventfd.patch
@@ -0,0 +1,59 @@
+From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 10 Jun 2012 16:36:23 +0000
+Subject: eventfd: Implement eventfd2 and fix eventfd
+
+eventfd: evntfd assumes to take two arguments instead it
+should be one evntfd expects two therefore implement both syscalls with
+correct parameters
+
+Thanks Eugene Rudoy for reporting it and also providing the patch
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
+index cc3f3f0..96597ab 100644
+--- a/libc/sysdeps/linux/common/eventfd.c
++++ b/libc/sysdeps/linux/common/eventfd.c
+@@ -7,12 +7,24 @@
+  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+  */
+ 
++#include <errno.h>
+ #include <sys/syscall.h>
+ #include <sys/eventfd.h>
+ 
+ /*
+  * eventfd()
+  */
+-#ifdef __NR_eventfd
+-_syscall2(int, eventfd, int, count, int, flags)
++#if defined __NR_eventfd || defined __NR_eventfd2
++int eventfd (int count, int flags)
++{
++#if defined __NR_eventfd2
++  return INLINE_SYSCALL (eventfd2, 2, count, flags);
++#elif defined __NR_eventfd
++  if (flags != 0) {
++     __set_errno (EINVAL);
++    return -1;
++  }
++  return INLINE_SYSCALL (eventfd, 1, count);
++#endif
++}
+ #endif
+diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
+index 3567b07..1fc2393 100644
+--- a/libc/sysdeps/linux/common/stubs.c
++++ b/libc/sysdeps/linux/common/stubs.c
+@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
+ make_stub(epoll_wait)
+ #endif
+ 
+-#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
++#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
+ make_stub(eventfd)
+ #endif
+ 
+--
+cgit v0.9.1
diff --git a/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/01_add-posix_fallocate.patch b/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/01_add-posix_fallocate.patch
new file mode 100644
index 00000000..dc7bbd75
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/patches/sys-libs/uclibc/01_add-posix_fallocate.patch
@@ -0,0 +1,321 @@
+From 5643900913f64c00f1c2958914586708efa5a473 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Tue, 17 Apr 2012 07:30:15 +0000
+Subject: libc: add posix_fallocate()
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+diff --git a/include/fcntl.h b/include/fcntl.h
+index ed009dd..c749ad5 100644
+--- a/include/fcntl.h
++++ b/include/fcntl.h
+@@ -217,9 +217,7 @@ extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len,
+ 
+ #endif
+ 
+-#if 0 /* && defined __UCLIBC_HAS_ADVANCED_REALTIME__ */
+-
+-/* FIXME -- uClibc should probably implement these... */
++#if defined __UCLIBC_HAS_ADVANCED_REALTIME__
+ 
+ /* Reserve storage for the data of the file associated with FD.
+ 
+diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
+index 566722d..29566dd 100644
+--- a/libc/sysdeps/linux/common/Makefile.in
++++ b/libc/sysdeps/linux/common/Makefile.in
+@@ -82,7 +82,8 @@ CSRC-$(UCLIBC_HAS_REALTIME) += clock_getres.c clock_gettime.c clock_settime.c \
+ 	sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \
+ 	sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c
+ # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_typed_mem_get_info|pthread_mutex_timedlock|sem_timedwait
+-CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c
++CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c \
++	posix_fallocate.c posix_fallocate64.c
+ CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c
+ CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c
+ CSRC-$(UCLIBC_HAS_XATTR) += xattr.c
+diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
+index 4d1e0cb..6184c2b 100644
+--- a/libc/sysdeps/linux/common/bits/kernel-features.h
++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
+@@ -495,6 +495,14 @@
+ # define __ASSUME_PRIVATE_FUTEX	1
+ #endif
+ 
++/* Support for fallocate was added in 2.6.23,
++   on s390 only after 2.6.23-rc1, on alpha only after 2.6.33-rc1.  */
++#if __LINUX_KERNEL_VERSION >= 0x020617 \
++    && (!defined __s390__ || __LINUX_KERNEL_VERSION >= 0x020618) \
++    && (!defined __alpha__ || __LINUX_KERNEL_VERSION >= 0x020621)
++# define __ASSUME_FALLOCATE 1
++#endif
++
+ /* getcpu is a syscall for x86-64 since 3.1.  */
+ #if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
+ # define __ASSUME_GETCPU_SYSCALL        1
+diff --git a/libc/sysdeps/linux/common/posix_fallocate.c b/libc/sysdeps/linux/common/posix_fallocate.c
+new file mode 100644
+index 0000000..9aaa6ce
+--- /dev/null
++++ b/libc/sysdeps/linux/common/posix_fallocate.c
+@@ -0,0 +1,43 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * posix_fallocate() for uClibc
++ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <fcntl.h>
++#include <bits/kernel-features.h>
++#include <stdint.h>
++
++#if defined __NR_fallocate
++int posix_fallocate(int fd, __off_t offset, __off_t len)
++{
++	int ret;
++
++# if __WORDSIZE == 32
++	uint32_t off_low = offset;
++	uint32_t len_low = len;
++	/* may assert that these >>31 are 0 */
++	uint32_t zero = 0;
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
++		__LONG_LONG_PAIR (zero, off_low),
++		__LONG_LONG_PAIR (zero, len_low)));
++# elif __WORDSIZE == 64
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 4, fd, 0, offset, len));
++# else
++# error your machine is neither 32 bit or 64 bit ... it must be magical
++#endif
++    if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
++      return INTERNAL_SYSCALL_ERRNO (ret, err);
++    return 0;
++}
++# if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64
++strong_alias(posix_fallocate,posix_fallocate64)
++# endif
++#endif
+diff --git a/libc/sysdeps/linux/common/posix_fallocate64.c b/libc/sysdeps/linux/common/posix_fallocate64.c
+new file mode 100644
+index 0000000..818d868
+--- /dev/null
++++ b/libc/sysdeps/linux/common/posix_fallocate64.c
+@@ -0,0 +1,39 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * posix_fallocate() for uClibc
++ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <fcntl.h>
++#include <bits/kernel-features.h>
++#include <stdint.h>
++
++#if defined __NR_fallocate
++
++# if __WORDSIZE == 64
++/* Can use normal posix_fallocate() */
++# elif __WORDSIZE == 32
++int posix_fallocate64(int fd, __off64_t offset, __off64_t len)
++{
++	int ret;
++	uint32_t off_low = offset & 0xffffffff;
++	uint32_t off_high = offset >> 32;
++	uint32_t len_low = len & 0xffffffff;
++	uint32_t len_high = len >> 32;
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
++		__LONG_LONG_PAIR (off_high, off_low),
++		__LONG_LONG_PAIR (len_high, len_low)));
++    if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
++      return INTERNAL_SYSCALL_ERRNO (ret, err);
++    return 0;
++}
++# else
++# error your machine is neither 32 bit or 64 bit ... it must be magical
++# endif
++#endif
+diff --git a/test/.gitignore b/test/.gitignore
+index c068f89..ec04628 100644
+--- a/test/.gitignore
++++ b/test/.gitignore
+@@ -319,6 +319,8 @@ unistd/getcwd
+ unistd/getopt
+ unistd/getopt_long
+ unistd/tstgetopt
++unistd/tst-posix_fallocate
++unistd/tst-posix_fallocate64
+ unistd/tst-preadwrite
+ unistd/tst-preadwrite64
+ unistd/vfork
+diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
+index c542f98..24b9a37 100644
+--- a/test/unistd/Makefile.in
++++ b/test/unistd/Makefile.in
+@@ -2,7 +2,10 @@
+ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ 
+ ifeq ($(UCLIBC_HAS_LFS),)
+-TESTS_DISABLED := tst-preadwrite64
++TESTS_DISABLED := tst-preadwrite64 tst-posix_fallocate64
++endif
++ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),)
++TESTS_DISABLED := tst-posix_fallocate
+ endif
+ OPTS_getopt      := -abcXXX -9
+ OPTS_getopt_long := --add XXX --delete YYY --verbose
+diff --git a/test/unistd/tst-posix_fallocate.c b/test/unistd/tst-posix_fallocate.c
+new file mode 100644
+index 0000000..d41c604
+--- /dev/null
++++ b/test/unistd/tst-posix_fallocate.c
+@@ -0,0 +1,127 @@
++#include <fcntl.h>
++#include <sys/stat.h>
++
++#ifndef TST_POSIX_FALLOCATE64
++# define stat64 stat
++# define fstat64 fstat
++# else
++# ifndef O_LARGEFILE
++#  error no O_LARGEFILE but you want to test with LFS enabled
++# endif
++#endif
++
++static void do_prepare (void);
++#define PREPARE(argc, argv) do_prepare ()
++static int do_test (void);
++#define TEST_FUNCTION do_test ()
++#include <test-skeleton.c>
++
++static int fd;
++static void
++do_prepare (void)
++{
++  fd = create_temp_file ("tst-posix_fallocate.", NULL);
++  if (fd == -1)
++    {
++      printf ("cannot create temporary file: %m\n");
++      exit (1);
++    }
++}
++
++
++static int
++do_test (void)
++{
++  struct stat64 st;
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("1st fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 0)
++    {
++      puts ("file not created with size 0");
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 512, 768) != 0)
++    {
++      puts ("1st posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("2nd fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 512 + 768)
++    {
++      printf ("file size after 1st posix_fallocate call is %llu, expected %u\n",
++	      (unsigned long long int) st.st_size, 512u + 768u);
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 0, 1024) != 0)
++    {
++      puts ("2nd posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("3rd fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 512 + 768)
++    {
++      puts ("file size changed in 2nd posix_fallocate");
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 2048, 64) != 0)
++    {
++      puts ("3rd posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("4th fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 2048 + 64)
++    {
++      printf ("file size after 3rd posix_fallocate call is %llu, expected %u\n",
++	      (unsigned long long int) st.st_size, 2048u + 64u);
++      return 1;
++    }
++#ifdef TST_POSIX_FALLOCATE64
++  if (posix_fallocate64 (fd, 4097ULL, 4294967295ULL + 2ULL) != 0)
++    {
++      puts ("4th posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("5th fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 4097ULL + 4294967295ULL + 2ULL)
++    {
++      printf ("file size after 4th posix_fallocate call is %llu, expected %llu\n",
++	      (unsigned long long int) st.st_size, 4097ULL + 4294967295ULL + 2ULL);
++      return 1;
++    }
++#endif
++  close (fd);
++
++  return 0;
++}
+diff --git a/test/unistd/tst-posix_fallocate64.c b/test/unistd/tst-posix_fallocate64.c
+new file mode 100644
+index 0000000..b1ee0ff
+--- /dev/null
++++ b/test/unistd/tst-posix_fallocate64.c
+@@ -0,0 +1,2 @@
++#define TST_POSIX_FALLOCATE64
++#include "tst-posix_fallocate.c"
+--
+cgit v0.9.1
diff --git a/tools-uclibc/portage.mips.hardened/profile/package.use.force b/tools-uclibc/portage.mips32r2.hardened/profile/package.use.force
index d73dfb34..d73dfb34 100644
--- a/tools-uclibc/portage.mips.hardened/profile/package.use.force
+++ b/tools-uclibc/portage.mips32r2.hardened/profile/package.use.force
diff --git a/tools-uclibc/portage.mips.hardened/savedconfig/sys-apps/busybox-1.21.0 b/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-apps/busybox-1.21.0
index b2387ae2..b2387ae2 100644
--- a/tools-uclibc/portage.mips.hardened/savedconfig/sys-apps/busybox-1.21.0
+++ b/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-apps/busybox-1.21.0
diff --git a/tools-uclibc/portage.mips.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3 b/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3
index 0f9fb000..0f9fb000 100644
--- a/tools-uclibc/portage.mips.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3
+++ b/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r3
diff --git a/tools-uclibc/portage.mips.vanilla/env/coreutils.conf b/tools-uclibc/portage.mips32r2.vanilla/env/coreutils.conf
index 518a258e..518a258e 100644
--- a/tools-uclibc/portage.mips.vanilla/env/coreutils.conf
+++ b/tools-uclibc/portage.mips32r2.vanilla/env/coreutils.conf
diff --git a/tools-uclibc/portage.mips.vanilla/env/git.conf b/tools-uclibc/portage.mips32r2.vanilla/env/git.conf
index 518a258e..518a258e 100644
--- a/tools-uclibc/portage.mips.vanilla/env/git.conf
+++ b/tools-uclibc/portage.mips32r2.vanilla/env/git.conf
diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.accept_keywords/eudev b/tools-uclibc/portage.mips32r2.vanilla/package.accept_keywords/eudev
new file mode 100644
index 00000000..9ad4c3a4
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.accept_keywords/eudev
@@ -0,0 +1 @@
+=sys-fs/eudev-1_beta4-r1 ~mips
diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.accept_keywords/gcc b/tools-uclibc/portage.mips32r2.vanilla/package.accept_keywords/gcc
new file mode 100644
index 00000000..18235b71
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.accept_keywords/gcc
@@ -0,0 +1 @@
+=sys-devel/gcc-4.6.3-r99 ~mips
diff --git a/tools-uclibc/portage.mips.vanilla/package.env b/tools-uclibc/portage.mips32r2.vanilla/package.env
index 73db8b38..73db8b38 100644
--- a/tools-uclibc/portage.mips.vanilla/package.env
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.env
diff --git a/tools-uclibc/portage.mips.vanilla/package.mask b/tools-uclibc/portage.mips32r2.vanilla/package.mask/gcc
index 1f114f43..f9876199 100644
--- a/tools-uclibc/portage.mips.vanilla/package.mask
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.mask/gcc
@@ -1,3 +1,2 @@
 =sys-devel/gcc-4.7*
 =sys-devel/gcc-4.8*
-sys-fs/udev
diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.mask/udev b/tools-uclibc/portage.mips32r2.vanilla/package.mask/udev
new file mode 100644
index 00000000..729aaa5c
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.mask/udev
@@ -0,0 +1 @@
+sys-fs/udev
diff --git a/tools-uclibc/portage.mips.vanilla/package.use b/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc
index 0715d0b5..0715d0b5 100644
--- a/tools-uclibc/portage.mips.vanilla/package.use
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc
diff --git a/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch b/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
new file mode 100644
index 00000000..cfc64de4
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/00_fix-eventfd.patch
@@ -0,0 +1,59 @@
+From e118373cbb58ba5ffa5fb6670957678d5b87cdb9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 10 Jun 2012 16:36:23 +0000
+Subject: eventfd: Implement eventfd2 and fix eventfd
+
+eventfd: evntfd assumes to take two arguments instead it
+should be one evntfd expects two therefore implement both syscalls with
+correct parameters
+
+Thanks Eugene Rudoy for reporting it and also providing the patch
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
+index cc3f3f0..96597ab 100644
+--- a/libc/sysdeps/linux/common/eventfd.c
++++ b/libc/sysdeps/linux/common/eventfd.c
+@@ -7,12 +7,24 @@
+  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+  */
+ 
++#include <errno.h>
+ #include <sys/syscall.h>
+ #include <sys/eventfd.h>
+ 
+ /*
+  * eventfd()
+  */
+-#ifdef __NR_eventfd
+-_syscall2(int, eventfd, int, count, int, flags)
++#if defined __NR_eventfd || defined __NR_eventfd2
++int eventfd (int count, int flags)
++{
++#if defined __NR_eventfd2
++  return INLINE_SYSCALL (eventfd2, 2, count, flags);
++#elif defined __NR_eventfd
++  if (flags != 0) {
++     __set_errno (EINVAL);
++    return -1;
++  }
++  return INLINE_SYSCALL (eventfd, 1, count);
++#endif
++}
+ #endif
+diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
+index 3567b07..1fc2393 100644
+--- a/libc/sysdeps/linux/common/stubs.c
++++ b/libc/sysdeps/linux/common/stubs.c
+@@ -110,7 +110,7 @@ make_stub(epoll_pwait)
+ make_stub(epoll_wait)
+ #endif
+ 
+-#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
++#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
+ make_stub(eventfd)
+ #endif
+ 
+--
+cgit v0.9.1
diff --git a/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/01_add-posix_fallocate.patch b/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/01_add-posix_fallocate.patch
new file mode 100644
index 00000000..dc7bbd75
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/patches/sys-libs/uclibc/01_add-posix_fallocate.patch
@@ -0,0 +1,321 @@
+From 5643900913f64c00f1c2958914586708efa5a473 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Tue, 17 Apr 2012 07:30:15 +0000
+Subject: libc: add posix_fallocate()
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+diff --git a/include/fcntl.h b/include/fcntl.h
+index ed009dd..c749ad5 100644
+--- a/include/fcntl.h
++++ b/include/fcntl.h
+@@ -217,9 +217,7 @@ extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len,
+ 
+ #endif
+ 
+-#if 0 /* && defined __UCLIBC_HAS_ADVANCED_REALTIME__ */
+-
+-/* FIXME -- uClibc should probably implement these... */
++#if defined __UCLIBC_HAS_ADVANCED_REALTIME__
+ 
+ /* Reserve storage for the data of the file associated with FD.
+ 
+diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
+index 566722d..29566dd 100644
+--- a/libc/sysdeps/linux/common/Makefile.in
++++ b/libc/sysdeps/linux/common/Makefile.in
+@@ -82,7 +82,8 @@ CSRC-$(UCLIBC_HAS_REALTIME) += clock_getres.c clock_gettime.c clock_settime.c \
+ 	sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \
+ 	sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c
+ # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_typed_mem_get_info|pthread_mutex_timedlock|sem_timedwait
+-CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c
++CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c \
++	posix_fallocate.c posix_fallocate64.c
+ CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c
+ CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c
+ CSRC-$(UCLIBC_HAS_XATTR) += xattr.c
+diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
+index 4d1e0cb..6184c2b 100644
+--- a/libc/sysdeps/linux/common/bits/kernel-features.h
++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
+@@ -495,6 +495,14 @@
+ # define __ASSUME_PRIVATE_FUTEX	1
+ #endif
+ 
++/* Support for fallocate was added in 2.6.23,
++   on s390 only after 2.6.23-rc1, on alpha only after 2.6.33-rc1.  */
++#if __LINUX_KERNEL_VERSION >= 0x020617 \
++    && (!defined __s390__ || __LINUX_KERNEL_VERSION >= 0x020618) \
++    && (!defined __alpha__ || __LINUX_KERNEL_VERSION >= 0x020621)
++# define __ASSUME_FALLOCATE 1
++#endif
++
+ /* getcpu is a syscall for x86-64 since 3.1.  */
+ #if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
+ # define __ASSUME_GETCPU_SYSCALL        1
+diff --git a/libc/sysdeps/linux/common/posix_fallocate.c b/libc/sysdeps/linux/common/posix_fallocate.c
+new file mode 100644
+index 0000000..9aaa6ce
+--- /dev/null
++++ b/libc/sysdeps/linux/common/posix_fallocate.c
+@@ -0,0 +1,43 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * posix_fallocate() for uClibc
++ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <fcntl.h>
++#include <bits/kernel-features.h>
++#include <stdint.h>
++
++#if defined __NR_fallocate
++int posix_fallocate(int fd, __off_t offset, __off_t len)
++{
++	int ret;
++
++# if __WORDSIZE == 32
++	uint32_t off_low = offset;
++	uint32_t len_low = len;
++	/* may assert that these >>31 are 0 */
++	uint32_t zero = 0;
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
++		__LONG_LONG_PAIR (zero, off_low),
++		__LONG_LONG_PAIR (zero, len_low)));
++# elif __WORDSIZE == 64
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 4, fd, 0, offset, len));
++# else
++# error your machine is neither 32 bit or 64 bit ... it must be magical
++#endif
++    if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
++      return INTERNAL_SYSCALL_ERRNO (ret, err);
++    return 0;
++}
++# if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64
++strong_alias(posix_fallocate,posix_fallocate64)
++# endif
++#endif
+diff --git a/libc/sysdeps/linux/common/posix_fallocate64.c b/libc/sysdeps/linux/common/posix_fallocate64.c
+new file mode 100644
+index 0000000..818d868
+--- /dev/null
++++ b/libc/sysdeps/linux/common/posix_fallocate64.c
+@@ -0,0 +1,39 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * posix_fallocate() for uClibc
++ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <fcntl.h>
++#include <bits/kernel-features.h>
++#include <stdint.h>
++
++#if defined __NR_fallocate
++
++# if __WORDSIZE == 64
++/* Can use normal posix_fallocate() */
++# elif __WORDSIZE == 32
++int posix_fallocate64(int fd, __off64_t offset, __off64_t len)
++{
++	int ret;
++	uint32_t off_low = offset & 0xffffffff;
++	uint32_t off_high = offset >> 32;
++	uint32_t len_low = len & 0xffffffff;
++	uint32_t len_high = len >> 32;
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
++		__LONG_LONG_PAIR (off_high, off_low),
++		__LONG_LONG_PAIR (len_high, len_low)));
++    if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
++      return INTERNAL_SYSCALL_ERRNO (ret, err);
++    return 0;
++}
++# else
++# error your machine is neither 32 bit or 64 bit ... it must be magical
++# endif
++#endif
+diff --git a/test/.gitignore b/test/.gitignore
+index c068f89..ec04628 100644
+--- a/test/.gitignore
++++ b/test/.gitignore
+@@ -319,6 +319,8 @@ unistd/getcwd
+ unistd/getopt
+ unistd/getopt_long
+ unistd/tstgetopt
++unistd/tst-posix_fallocate
++unistd/tst-posix_fallocate64
+ unistd/tst-preadwrite
+ unistd/tst-preadwrite64
+ unistd/vfork
+diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
+index c542f98..24b9a37 100644
+--- a/test/unistd/Makefile.in
++++ b/test/unistd/Makefile.in
+@@ -2,7 +2,10 @@
+ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ 
+ ifeq ($(UCLIBC_HAS_LFS),)
+-TESTS_DISABLED := tst-preadwrite64
++TESTS_DISABLED := tst-preadwrite64 tst-posix_fallocate64
++endif
++ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),)
++TESTS_DISABLED := tst-posix_fallocate
+ endif
+ OPTS_getopt      := -abcXXX -9
+ OPTS_getopt_long := --add XXX --delete YYY --verbose
+diff --git a/test/unistd/tst-posix_fallocate.c b/test/unistd/tst-posix_fallocate.c
+new file mode 100644
+index 0000000..d41c604
+--- /dev/null
++++ b/test/unistd/tst-posix_fallocate.c
+@@ -0,0 +1,127 @@
++#include <fcntl.h>
++#include <sys/stat.h>
++
++#ifndef TST_POSIX_FALLOCATE64
++# define stat64 stat
++# define fstat64 fstat
++# else
++# ifndef O_LARGEFILE
++#  error no O_LARGEFILE but you want to test with LFS enabled
++# endif
++#endif
++
++static void do_prepare (void);
++#define PREPARE(argc, argv) do_prepare ()
++static int do_test (void);
++#define TEST_FUNCTION do_test ()
++#include <test-skeleton.c>
++
++static int fd;
++static void
++do_prepare (void)
++{
++  fd = create_temp_file ("tst-posix_fallocate.", NULL);
++  if (fd == -1)
++    {
++      printf ("cannot create temporary file: %m\n");
++      exit (1);
++    }
++}
++
++
++static int
++do_test (void)
++{
++  struct stat64 st;
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("1st fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 0)
++    {
++      puts ("file not created with size 0");
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 512, 768) != 0)
++    {
++      puts ("1st posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("2nd fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 512 + 768)
++    {
++      printf ("file size after 1st posix_fallocate call is %llu, expected %u\n",
++	      (unsigned long long int) st.st_size, 512u + 768u);
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 0, 1024) != 0)
++    {
++      puts ("2nd posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("3rd fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 512 + 768)
++    {
++      puts ("file size changed in 2nd posix_fallocate");
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 2048, 64) != 0)
++    {
++      puts ("3rd posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("4th fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 2048 + 64)
++    {
++      printf ("file size after 3rd posix_fallocate call is %llu, expected %u\n",
++	      (unsigned long long int) st.st_size, 2048u + 64u);
++      return 1;
++    }
++#ifdef TST_POSIX_FALLOCATE64
++  if (posix_fallocate64 (fd, 4097ULL, 4294967295ULL + 2ULL) != 0)
++    {
++      puts ("4th posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("5th fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 4097ULL + 4294967295ULL + 2ULL)
++    {
++      printf ("file size after 4th posix_fallocate call is %llu, expected %llu\n",
++	      (unsigned long long int) st.st_size, 4097ULL + 4294967295ULL + 2ULL);
++      return 1;
++    }
++#endif
++  close (fd);
++
++  return 0;
++}
+diff --git a/test/unistd/tst-posix_fallocate64.c b/test/unistd/tst-posix_fallocate64.c
+new file mode 100644
+index 0000000..b1ee0ff
+--- /dev/null
++++ b/test/unistd/tst-posix_fallocate64.c
+@@ -0,0 +1,2 @@
++#define TST_POSIX_FALLOCATE64
++#include "tst-posix_fallocate.c"
+--
+cgit v0.9.1
diff --git a/tools-uclibc/portage.mips.vanilla/profile/package.use.force b/tools-uclibc/portage.mips32r2.vanilla/profile/package.use.force
index d73dfb34..d73dfb34 100644
--- a/tools-uclibc/portage.mips.vanilla/profile/package.use.force
+++ b/tools-uclibc/portage.mips32r2.vanilla/profile/package.use.force
diff --git a/tools-uclibc/portage.mips.vanilla/profile/use.mask b/tools-uclibc/portage.mips32r2.vanilla/profile/use.mask
index cf56f2f6..cf56f2f6 100644
--- a/tools-uclibc/portage.mips.vanilla/profile/use.mask
+++ b/tools-uclibc/portage.mips32r2.vanilla/profile/use.mask
diff --git a/tools-uclibc/portage.mips.vanilla/savedconfig/sys-apps/busybox-1.21.0 b/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-apps/busybox-1.21.0
index b2387ae2..b2387ae2 100644
--- a/tools-uclibc/portage.mips.vanilla/savedconfig/sys-apps/busybox-1.21.0
+++ b/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-apps/busybox-1.21.0
diff --git a/tools-uclibc/portage.mips.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3 b/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3
index 0f9fb000..0f9fb000 100644
--- a/tools-uclibc/portage.mips.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3
+++ b/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r3
diff --git a/tools-uclibc/run-mips32r2.sh b/tools-uclibc/run-mips32r2.sh
index 4113b212..e549f19f 100755
--- a/tools-uclibc/run-mips32r2.sh
+++ b/tools-uclibc/run-mips32r2.sh
@@ -16,10 +16,27 @@ prepare_confs() {
   local flavor=$2
 
   for s in 1 2 3; do
-    cat stage${s}-${arch}-uclibc-${flavor}.conf.template | \
+
+    local cstage=stage${s}
+    local p=$(( s - 1 ))
+    [[ $p == 0 ]] && p=3
+    local pstage=stage${p}
+    local tarch="${arch%32r2}"
+    local parch="${tarch}"
+
+    cat stage-all.conf.template | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-        -e "s:MyCatalyst:$(pwd):" >  stage${s}-${arch}-uclibc-${flavor}.conf
+        -e "s:CSTAGE:${cstage}:g" \
+        -e "s:PSTAGE:${pstage}:g" \
+        -e "s:SARCH:${arch}:g" \
+        -e "s:PARCH:${parch}:g" \
+        -e "s:TARCH:${tarch}:g" \
+        -e "s:FLAVOR:${flavor}:g" \
+        -e "s:MYCATALYST:$(pwd):g" \
+        >  stage${s}-${arch}-uclibc-${flavor}.conf
   done
+
+  sed -i "/^chost/d" stage3-${arch}-uclibc-${flavor}.conf
 }
 
 banner() {
diff --git a/tools-uclibc/stage1-mips32r2-uclibc-hardened.conf.template b/tools-uclibc/stage1-mips32r2-uclibc-hardened.conf.template
deleted file mode 100644
index 588a6746..00000000
--- a/tools-uclibc/stage1-mips32r2-uclibc-hardened.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: mips32r2
-target: stage1
-version_stamp: uclibc-hardened
-rel_type: hardened/mips32r2
-profile: hardened/linux/uclibc/mips
-snapshot: current
-source_subpath: hardened/mips32r2/stage3-mips32r2-uclibc-hardened
-chost: mips-gentoo-linux-uclibc
-portage_confdir: MyCatalyst/portage.mips.hardened
diff --git a/tools-uclibc/stage1-mips32r2-uclibc-vanilla.conf.template b/tools-uclibc/stage1-mips32r2-uclibc-vanilla.conf.template
deleted file mode 100644
index 8e4b6ecf..00000000
--- a/tools-uclibc/stage1-mips32r2-uclibc-vanilla.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: mips32r2
-target: stage1
-version_stamp: uclibc-vanilla
-rel_type: vanilla/mips32r2
-profile: hardened/linux/uclibc/mips
-snapshot: current
-source_subpath: vanilla/mips32r2/stage3-mips32r2-uclibc-vanilla
-chost: mips-gentoo-linux-uclibc
-portage_confdir: MyCatalyst/portage.mips.vanilla
diff --git a/tools-uclibc/stage2-mips32r2-uclibc-hardened.conf.template b/tools-uclibc/stage2-mips32r2-uclibc-hardened.conf.template
deleted file mode 100644
index 4c587fb8..00000000
--- a/tools-uclibc/stage2-mips32r2-uclibc-hardened.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: mips32r2
-target: stage2
-version_stamp: uclibc-hardened
-rel_type: hardened/mips32r2
-profile: hardened/linux/uclibc/mips
-snapshot: current
-source_subpath: hardened/mips32r2/stage1-mips32r2-uclibc-hardened
-chost: mips-gentoo-linux-uclibc
-portage_confdir: MyCatalyst/portage.mips.hardened
diff --git a/tools-uclibc/stage2-mips32r2-uclibc-vanilla.conf.template b/tools-uclibc/stage2-mips32r2-uclibc-vanilla.conf.template
deleted file mode 100644
index 6f19e9fe..00000000
--- a/tools-uclibc/stage2-mips32r2-uclibc-vanilla.conf.template
+++ /dev/null
@@ -1,9 +0,0 @@
-subarch: mips32r2
-target: stage2
-version_stamp: uclibc-vanilla
-rel_type: vanilla/mips32r2
-profile: hardened/linux/uclibc/mips
-snapshot: current
-source_subpath: vanilla/mips32r2/stage1-mips32r2-uclibc-vanilla
-chost: mips-gentoo-linux-uclibc
-portage_confdir: MyCatalyst/portage.mips.vanilla
diff --git a/tools-uclibc/stage3-mips32r2-uclibc-hardened.conf.template b/tools-uclibc/stage3-mips32r2-uclibc-hardened.conf.template
deleted file mode 100644
index 8d374108..00000000
--- a/tools-uclibc/stage3-mips32r2-uclibc-hardened.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-subarch: mips32r2
-target: stage3
-version_stamp: uclibc-hardened
-rel_type: hardened/mips32r2
-profile: hardened/linux/uclibc/mips
-snapshot: current
-source_subpath: hardened/mips32r2/stage2-mips32r2-uclibc-hardened
-portage_confdir: MyCatalyst/portage.mips.hardened
diff --git a/tools-uclibc/stage3-mips32r2-uclibc-vanilla.conf.template b/tools-uclibc/stage3-mips32r2-uclibc-vanilla.conf.template
deleted file mode 100644
index 70ead58a..00000000
--- a/tools-uclibc/stage3-mips32r2-uclibc-vanilla.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-subarch: mips32r2
-target: stage3
-version_stamp: uclibc-vanilla
-rel_type: vanilla/mips32r2
-profile: hardened/linux/uclibc/mips
-snapshot: current
-source_subpath: vanilla/mips32r2/stage2-mips32r2-uclibc-vanilla
-portage_confdir: MyCatalyst/portage.mips.vanilla