Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/releng

This commit is contained in:
Devan Franchini 2014-04-24 22:52:38 -04:00
commit 1263735721
9 changed files with 245 additions and 42 deletions

View file

@ -1,29 +1,27 @@
subarch: hppa1.1
version_stamp: 20130920
version_stamp: 20140201
target: livecd-stage1
rel_type: default
profile: default/linux/hppa/13.0
snapshot: 20130920
source_subpath: default/stage3-hppa1.1-20130920
snapshot: 20140201
source_subpath: default/stage3-hppa1.1-20140201
livecd/use:
deprecated
-*
python_targets_python2_7
bindist
fbcon
ipv6
livecd
loop-aes
lvm1
modules
ncurses
nls
nptl
nptlonly
pam
readline
socks5
ssl
static-libs
openssl
curl_ssl_openssl
unicode
xml
livecd/packages:
app-accessibility/brltty
@ -37,6 +35,7 @@ livecd/packages:
app-misc/vlock
app-portage/mirrorselect
app-text/wgetpaste
dev-util/debootstrap
net-analyzer/traceroute
net-dialup/mingetty
net-dialup/rp-pppoe
@ -61,7 +60,6 @@ livecd/packages:
sys-devel/kgcc64
sys-fs/dosfstools
sys-fs/e2fsprogs
# sys-fs/jfsutils
sys-fs/lsscsi
sys-fs/cryptsetup
sys-fs/lvm2

View file

@ -1,25 +1,25 @@
subarch: hppa1.1
version_stamp: 20130920
version_stamp: 20140201
target: livecd-stage2
rel_type: default
profile: default/linux/hppa/13.0
snapshot: 20130920
source_subpath: default/livecd-stage1-hppa1.1-20130920
snapshot: 20140201
source_subpath: default/livecd-stage1-hppa1.1-20140201
livecd/volid: Gentoo Linux - HPPA
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
livecd/fstype: squashfs
#livecd/gk_mainargs: --lvm --dmraid --mdadm --arch-override=parisc
livecd/gk_mainargs: --arch-override=parisc
#livecd/gk_mainargs: --arch-override=parisc
livecd/iso: /usr/local/catalyst/builds/default/install-hppa-minimal-20130920.iso
livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-minimal-20140201.iso
livecd/type: gentoo-release-minimal
boot/kernel: livecd32 livecd64
# On hppa, kernelopts are common for all kernel and will be applied to both
boot/kernel/livecd32/kernelopts: panic=30
boot/kernel/livecd32/sources: sys-kernel/gentoo-sources
boot/kernel/livecd32/config: /root/gmsoft-specs/installcd-3.10.7-gentoo-livecd32.config
boot/kernel/livecd32/config: /home/gmsoft/specs/installcd-3.10.7-gentoo-livecd32.config
boot/kernel/livecd32/use:
-*
atm
@ -44,11 +44,8 @@ boot/kernel/livecd32/use:
unicode
usb
#boot/kernel/livecd32/packages:
# sys-fs/ntfs3g
boot/kernel/livecd64/sources: sys-kernel/gentoo-sources
boot/kernel/livecd64/config: /root/gmsoft-specs/installcd-3.10.7-gentoo-livecd64.config
boot/kernel/livecd64/config: /home/gmsoft/specs/installcd-3.10.7-gentoo-livecd64.config
boot/kernel/livecd64/gk_kernargs: --kernel-cross-compile=hppa64-unknown-linux-gnu-
boot/kernel/livecd64/use:
-*
@ -74,34 +71,59 @@ boot/kernel/livecd64/use:
unicode
usb
#boot/kernel/livecd64/packages:
# sys-fs/ntfs3g
boot/kernel/livecd32/extraversion: livecd32
boot/kernel/livecd64/extraversion: livecd64
livecd/unmerge:
app-admin/eselect
app-admin/eselect-ctags
app-admin/eselect-vi
app-admin/eselect-lib-bin-symlink
app-admin/eselect-pinentry
app-admin/eselect-python
app-admin/perl-cleaner
app-admin/python-updater
app-arch/cpio
app-crypt/gnupg
app-crypt/pinentry
app-portage/portage-utils
dev-libs/gmp
app-text/build-docbook-catalog
app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
app-text/openjade
app-text/opensp
app-text/po4a
app-text/sgml-common
dev-libs/elfutils
dev-libs/eventlog
dev-libs/libassuan
dev-libs/pth
dev-libs/libgpg-error
dev-libs/libksba
dev-libs/libpipeline
dev-libs/libxml2
dev-libs/libxslt
dev-libs/mpc
dev-libs/mpfr
dev-libs/popt
dev-python/pycrypto
dev-util/gtk-doc-am
dev-util/intltool
dev-util/pkgconfig
net-misc/netifrc
net-misc/rsync
net-proxy/ntlmaps
perl-core/PodParser
perl-core/Test-Harness
sys-apps/debianutils
sys-apps/diffutils
sys-apps/groff
sys-apps/man
sys-apps/man-pages
sys-apps/miscfiles
sys-apps/help2man
sys-apps/man-db
sys-apps/portage
sys-apps/sandbox
sys-apps/tcp-wrappers
sys-apps/texinfo
sys-boot/palo
sys-apps/miscfiles
sys-devel/autoconf
sys-devel/autoconf-wrapper
sys-devel/automake
@ -120,11 +142,13 @@ livecd/unmerge:
sys-devel/m4
sys-devel/make
sys-devel/patch
sys-libs/db
sys-libs/gdbm
sys-libs/libkudzu
sys-kernel/genkernel
sys-kernel/linux-headers
sys-libs/db
sys-libs/gdbm
sys-libs/cracklib
sys-libs/libkudzu
x11-misc/shared-mime-info
livecd/empty:
/etc/cron.daily

View file

@ -14,5 +14,3 @@ source /var/lib/layman/make.conf
GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo"
SYNC="rsync://192.168.3.1/portage"
source /var/lib/layman/make.conf

View file

@ -1,3 +0,0 @@
=sys-apps/getent-0 ~amd64 ~arm ~x86
=sys-libs/musl-1.0.0 ~amd64 ~arm ~x86
=app-text/openjade-1.3.2-r6 ~amd64 ~arm ~x86

View file

@ -2,7 +2,7 @@ CHOST=MY_CHOST
CFLAGS="-Os -pipe -fomit-frame-pointerMY_CFLAGS"
CXXFLAGS="${CFLAGS}"
USE="-cxx -hardened -fortran -mudflap"
USE="-hardened -fortran -mudflap"
USE="${USE} -xattr python zlib"
MAKEOPTS="-j9"

View file

@ -1,3 +1,4 @@
=sys-apps/getent-0 ~amd64 ~arm ~x86
=sys-libs/musl-1.0.0 ~amd64 ~arm ~x86
=sys-libs/musl-1.1.0 ~amd64 ~arm ~x86
=app-text/openjade-1.3.2-r6 ~amd64 ~arm ~x86
=sys-fs/eudev-1.6 ~amd64 ~arm ~x86

View file

@ -0,0 +1,91 @@
From 76ff037059f6d387bde9d540f7e27a2b376d7cd7 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 18 Jan 2013 11:12:49 +0100
Subject: [PATCH] mount.h: update
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
include/sys/mount.h | 45 +++++++++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/include/sys/mount.h b/include/sys/mount.h
index fbd61fd..c0e7b84 100644
--- a/include/sys/mount.h
+++ b/include/sys/mount.h
@@ -1,5 +1,5 @@
/* Header file for mounting/unmount Linux filesystems.
- Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
+ Copyright (C) 1996-2000, 2004, 2010, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -46,23 +46,46 @@ enum
#define MS_REMOUNT MS_REMOUNT
MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
#define MS_MANDLOCK MS_MANDLOCK
- S_WRITE = 128, /* Write on file/directory/symlink. */
-#define S_WRITE S_WRITE
- S_APPEND = 256, /* Append-only file. */
-#define S_APPEND S_APPEND
- S_IMMUTABLE = 512, /* Immutable file. */
-#define S_IMMUTABLE S_IMMUTABLE
+ MS_DIRSYNC = 128, /* Directory modifications are synchronous. */
+#define MS_DIRSYNC MS_DIRSYNC
MS_NOATIME = 1024, /* Do not update access times. */
#define MS_NOATIME MS_NOATIME
MS_NODIRATIME = 2048, /* Do not update directory access times. */
#define MS_NODIRATIME MS_NODIRATIME
MS_BIND = 4096, /* Bind directory at different place. */
#define MS_BIND MS_BIND
+ MS_MOVE = 8192,
+#define MS_MOVE MS_MOVE
+ MS_REC = 16384,
+#define MS_REC MS_REC
+ MS_SILENT = 32768,
+#define MS_SILENT MS_SILENT
+ MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */
+#define MS_POSIXACL MS_POSIXACL
+ MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */
+#define MS_UNBINDABLE MS_UNBINDABLE
+ MS_PRIVATE = 1 << 18, /* Change to private. */
+#define MS_PRIVATE MS_PRIVATE
+ MS_SLAVE = 1 << 19, /* Change to slave. */
+#define MS_SLAVE MS_SLAVE
+ MS_SHARED = 1 << 20, /* Change to shared. */
+#define MS_SHARED MS_SHARED
+ MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */
+#define MS_RELATIME MS_RELATIME
+ MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */
+#define MS_KERNMOUNT MS_KERNMOUNT
+ MS_I_VERSION = 1 << 23, /* Update inode I_version field. */
+#define MS_I_VERSION MS_I_VERSION
+ MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */
+#define MS_STRICTATIME MS_STRICTATIME
+ MS_ACTIVE = 1 << 30,
+#define MS_ACTIVE MS_ACTIVE
+ MS_NOUSER = 1 << 31
+#define MS_NOUSER MS_NOUSER
};
/* Flags that can be altered by MS_REMOUNT */
-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
- |MS_NODIRATIME)
+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
/* Magic mount flag number. Has to be or-ed to the flag values. */
@@ -99,8 +122,10 @@ enum
#define MNT_FORCE MNT_FORCE
MNT_DETACH = 2, /* Just detach from the tree. */
#define MNT_DETACH MNT_DETACH
- MNT_EXPIRE = 4 /* Mark for expiry. */
+ MNT_EXPIRE = 4, /* Mark for expiry. */
#define MNT_EXPIRE MNT_EXPIRE
+ UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */
+#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
};
--
1.8.3.2

View file

@ -0,0 +1,91 @@
From 76ff037059f6d387bde9d540f7e27a2b376d7cd7 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 18 Jan 2013 11:12:49 +0100
Subject: [PATCH] mount.h: update
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
include/sys/mount.h | 45 +++++++++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/include/sys/mount.h b/include/sys/mount.h
index fbd61fd..c0e7b84 100644
--- a/include/sys/mount.h
+++ b/include/sys/mount.h
@@ -1,5 +1,5 @@
/* Header file for mounting/unmount Linux filesystems.
- Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
+ Copyright (C) 1996-2000, 2004, 2010, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -46,23 +46,46 @@ enum
#define MS_REMOUNT MS_REMOUNT
MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
#define MS_MANDLOCK MS_MANDLOCK
- S_WRITE = 128, /* Write on file/directory/symlink. */
-#define S_WRITE S_WRITE
- S_APPEND = 256, /* Append-only file. */
-#define S_APPEND S_APPEND
- S_IMMUTABLE = 512, /* Immutable file. */
-#define S_IMMUTABLE S_IMMUTABLE
+ MS_DIRSYNC = 128, /* Directory modifications are synchronous. */
+#define MS_DIRSYNC MS_DIRSYNC
MS_NOATIME = 1024, /* Do not update access times. */
#define MS_NOATIME MS_NOATIME
MS_NODIRATIME = 2048, /* Do not update directory access times. */
#define MS_NODIRATIME MS_NODIRATIME
MS_BIND = 4096, /* Bind directory at different place. */
#define MS_BIND MS_BIND
+ MS_MOVE = 8192,
+#define MS_MOVE MS_MOVE
+ MS_REC = 16384,
+#define MS_REC MS_REC
+ MS_SILENT = 32768,
+#define MS_SILENT MS_SILENT
+ MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */
+#define MS_POSIXACL MS_POSIXACL
+ MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */
+#define MS_UNBINDABLE MS_UNBINDABLE
+ MS_PRIVATE = 1 << 18, /* Change to private. */
+#define MS_PRIVATE MS_PRIVATE
+ MS_SLAVE = 1 << 19, /* Change to slave. */
+#define MS_SLAVE MS_SLAVE
+ MS_SHARED = 1 << 20, /* Change to shared. */
+#define MS_SHARED MS_SHARED
+ MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */
+#define MS_RELATIME MS_RELATIME
+ MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */
+#define MS_KERNMOUNT MS_KERNMOUNT
+ MS_I_VERSION = 1 << 23, /* Update inode I_version field. */
+#define MS_I_VERSION MS_I_VERSION
+ MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */
+#define MS_STRICTATIME MS_STRICTATIME
+ MS_ACTIVE = 1 << 30,
+#define MS_ACTIVE MS_ACTIVE
+ MS_NOUSER = 1 << 31
+#define MS_NOUSER MS_NOUSER
};
/* Flags that can be altered by MS_REMOUNT */
-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
- |MS_NODIRATIME)
+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
/* Magic mount flag number. Has to be or-ed to the flag values. */
@@ -99,8 +122,10 @@ enum
#define MNT_FORCE MNT_FORCE
MNT_DETACH = 2, /* Just detach from the tree. */
#define MNT_DETACH MNT_DETACH
- MNT_EXPIRE = 4 /* Mark for expiry. */
+ MNT_EXPIRE = 4, /* Mark for expiry. */
#define MNT_EXPIRE MNT_EXPIRE
+ UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */
+#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
};
--
1.8.3.2

View file

@ -15,6 +15,9 @@ verbose=0
keep_tmpdir=0
testing=0
# Set pipefail so that run_cmd returns the right value in $?
set -o pipefail
usage() {
msg=$1