mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 20:26:44 +02:00
coreutils: upgraded package to upstream (and drop realpath)
Upgraded sys-apps/coreutils to version 8.20 on amd64, arm, and x86
This version includes the realpath package, so drop that from the
tree so people don't try to install/depend on it anymore.
This also includes a fix for the issue that caused it to be reverted
before -- broken `cp --no-preserve=mode`.
BUG=chromium-os:24204
TEST=`cbuildbot chromiumos-sdk` worked
TEST=`cbuildbot {amd64,arm,x86}-generic-full` worked
Change-Id: I473dee144dddacefe4ad60279497ce7e8e8c11c7
Previous-Reviewed-on: https://gerrit.chromium.org/gerrit/39312
Reviewed-on: https://gerrit.chromium.org/gerrit/39967
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger
Gerrit
parent
b3a9281023
commit
4fed295e1b
@ -1,2 +0,0 @@
|
||||
DIST realpath_1.15.tar.gz 17406 RMD160 83129946171248446b3bcd1eae8ad82217c4248d SHA1 27174ef37d846761a12ebd81af1398327ee824b9 SHA256 b3d11cec375145ea60663e6fe54727c70a0e86c18f40bddac2a89b635cc1531f
|
||||
DIST realpath_1.15_i386.deb 15670 RMD160 cedc694ff0e7302581ee3a81ba951ca591309828 SHA1 a890ea32d012d712fc263a68a076631805feab4c SHA256 6fdcace221422a042d7fce941e46977adfb3b1da44d23e8be00628c56d726d3e
|
||||
@ -1,26 +0,0 @@
|
||||
diff -ur realpath-1.14.orig/common.mk realpath-1.14/common.mk
|
||||
--- realpath-1.14.orig/common.mk 2009-02-22 11:58:00.000000000 +0000
|
||||
+++ realpath-1.14/common.mk 2009-04-30 16:12:29.000000000 +0000
|
||||
@@ -34,9 +34,9 @@
|
||||
applicationsdir := $(prefix)/share/applications
|
||||
|
||||
PERL := /usr/bin/perl
|
||||
-CC := gcc
|
||||
-CFLAGS = -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
|
||||
-LDFLAGS :=
|
||||
+CC ?= gcc
|
||||
+CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
|
||||
+LDFLAGS +=
|
||||
LIBS :=
|
||||
|
||||
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
||||
@@ -60,9 +60,6 @@
|
||||
unexport CDPATH ENV
|
||||
|
||||
ifdef DESTDIR
|
||||
- ifneq ($(DESTDIR),$(abspath $(DESTDIR)))
|
||||
- $(error DESTDIR "$(DESTDIR)" is not an absolute path)
|
||||
- endif
|
||||
override ddirshort := DESTDIR
|
||||
export ddirshort
|
||||
endif
|
||||
@ -1,12 +0,0 @@
|
||||
Don't require po4a at build time.
|
||||
http://bugs.gentoo.org/269905
|
||||
|
||||
--- realpath-1.14-orig/po/Makefile 2009-02-22 12:56:47.000000000 +0100
|
||||
+++ realpath-1.14/po/Makefile 2009-05-19 23:45:26.000000000 +0200
|
||||
@@ -4,5 +4,5 @@
|
||||
#
|
||||
|
||||
ALL_TARGET=
|
||||
-SUBDIRS=bin man
|
||||
+SUBDIRS=bin
|
||||
include ../common.mk
|
||||
@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15.ebuild,v 1.1 2009/10/13 16:58:23 ulm Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Return the canonicalized absolute pathname"
|
||||
HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
|
||||
SRC_URI="mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz
|
||||
nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND="!sys-freebsd/freebsd-bin"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${PN}_${PV}.tar.gz
|
||||
|
||||
if use nls; then
|
||||
# Unpack the .deb file, in order to get the preprocessed man page
|
||||
# translations. This way we avoid a dependency on app-text/po4a.
|
||||
mkdir deb
|
||||
cd deb
|
||||
unpack ${PN}_${PV}_i386.deb
|
||||
unpack ./data.tar.gz
|
||||
gunzip -r usr/share/man || die "gunzip failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.14-build.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.14-no-po4a.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
emake VERSION="${PV}" SUBDIRS="src man $(use nls && echo po)" \
|
||||
|| die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake VERSION="${PV}" SUBDIRS="src man $(use nls && echo po)" \
|
||||
DESTDIR="${D}" install || die "emake install failed"
|
||||
newdoc debian/changelog ChangeLog.debian
|
||||
|
||||
if use nls; then
|
||||
local dir
|
||||
for dir in "${WORKDIR}"/deb/usr/share/man/*; do
|
||||
[ -f "${dir}"/man1/realpath.1 ] || continue
|
||||
newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1 \
|
||||
|| die "newman failed"
|
||||
done
|
||||
fi
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst test unpack
|
||||
DEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1 >=sys-libs/ncurses-5.3-r5 || ( app-arch/xz-utils app-arch/lzma-utils )
|
||||
DESCRIPTION=Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)
|
||||
HOMEPAGE=http://www.gnu.org/software/coreutils/
|
||||
IUSE=acl caps gmp nls selinux static vanilla xattr
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1 >=sys-libs/ncurses-5.3-r5
|
||||
SLOT=0
|
||||
SRC_URI=ftp://alpha.gnu.org/gnu/coreutils/coreutils-7.5.tar.gz mirror://gnu/coreutils/coreutils-7.5.tar.gz mirror://gentoo/coreutils-7.5.tar.gz mirror://gentoo/coreutils-7.5-patches-2.tar.lzma http://dev.gentoo.org/~vapier/dist/coreutils-7.5-patches-2.tar.lzma
|
||||
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=ec18fcab9b6291f3a6f280510f300665
|
||||
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/coreutils-8.20
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/coreutils-8.20
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=configure install postinst prepare test
|
||||
DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1 static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils
|
||||
DESCRIPTION=Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)
|
||||
EAPI=3
|
||||
HOMEPAGE=http://www.gnu.org/software/coreutils/
|
||||
IUSE=acl caps gmp nls selinux static userland_BSD vanilla xattr
|
||||
KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.20.tar.xz mirror://gnu/coreutils/coreutils-8.20.tar.xz mirror://gentoo/coreutils-8.20.tar.xz mirror://gentoo/coreutils-8.20-patches-1.1.tar.xz http://dev.gentoo.org/~ryao/dist/coreutils-8.20-patches-1.1.tar.xz
|
||||
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=51a4adcd372a18514da63848b1d8649f
|
||||
@ -1,2 +1,2 @@
|
||||
DIST coreutils-7.5-patches-2.tar.lzma 8370 RMD160 fef456359dd907c8264686720676ea1dabb90b63 SHA1 55f1b88bfeca34cd09c4ba305f6c0d45cfa3fd3f SHA256 1ee33146c960671f6cb54ca4916f6a828db904dae84841ec690eae7c0205e9a2
|
||||
DIST coreutils-7.5.tar.gz 9956013 RMD160 17785526e6820705aa5790454af1bd3d0d4104aa SHA1 97e1486a33bf42eb7686d8f131c80ab533f1f683 SHA256 341f49b9434f83ca9a8b6c2266813092ef08a5fca25f15dcc1a0ba82fc18c3c1
|
||||
DIST coreutils-8.20-patches-1.2.tar.xz 20864 SHA256 a969b9178b12a9e4e82529d8e1d056b2e3eb1dd299e29e36f43961aa204c208c SHA512 e851eb79028aa6cd52f033df1a9897f053bfe860f5bd710e93f5b4e38026a717bcf85c4ccb8f7a1fd5898733cd4d16ae8180eff3359c886c901b2c65e2975a9e WHIRLPOOL 3369f67cc15d332605af1cc74919495a076c3563653d3c085e5df5aac4142920d8e956ae93abf05b1ee012b76fec843a0841924ad4580ddd79889a01ca76846b
|
||||
DIST coreutils-8.20.tar.xz 5273788 RMD160 1e634929fd0934754bab8e2293e2b8c365ac04a4 SHA1 b120f138758100060333c2ed207ee276dd318980 SHA256 dbcb798764827a0f74be738662ecb516705cf520330cd3d7b2640fdffa499eb2
|
||||
|
||||
@ -1,45 +1,47 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.5-r1.ebuild,v 1.3 2009/11/09 22:54:34 vapier Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.20.ebuild,v 1.8 2012/12/08 19:40:53 vapier Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs
|
||||
|
||||
PATCH_VER="2"
|
||||
PATCH_VER="1.2"
|
||||
DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
|
||||
HOMEPAGE="http://www.gnu.org/software/coreutils/"
|
||||
SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.gz
|
||||
mirror://gnu/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}.tar.gz
|
||||
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma
|
||||
http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.lzma"
|
||||
SRC_URI="mirror://gnu-alpha/coreutils/${P}.tar.xz
|
||||
mirror://gnu/${PN}/${P}.tar.xz
|
||||
mirror://gentoo/${P}.tar.xz
|
||||
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
|
||||
http://dev.gentoo.org/~ryao/dist/${P}-patches-${PATCH_VER}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="acl caps gmp nls selinux static vanilla xattr"
|
||||
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
|
||||
IUSE="acl caps gmp nls selinux static userland_BSD vanilla xattr"
|
||||
|
||||
RDEPEND="caps? ( sys-libs/libcap )
|
||||
gmp? ( dev-libs/gmp )
|
||||
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
|
||||
caps? ( sys-libs/libcap )
|
||||
gmp? ( dev-libs/gmp[static-libs] )
|
||||
xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
acl? ( sys-apps/acl )
|
||||
xattr? ( sys-apps/attr )
|
||||
nls? ( >=sys-devel/gettext-0.15 )
|
||||
!app-misc/realpath
|
||||
!<sys-apps/util-linux-2.13
|
||||
!sys-apps/stat
|
||||
!net-mail/base64
|
||||
!sys-apps/mktemp
|
||||
!<app-forensics/tct-1.18-r1
|
||||
!<net-fs/netatalk-2.0.3-r4
|
||||
!<sci-chemistry/ccp4-6.1.1
|
||||
>=sys-libs/ncurses-5.3-r5"
|
||||
!<sci-chemistry/ccp4-6.1.1"
|
||||
DEPEND="${RDEPEND}
|
||||
|| ( app-arch/xz-utils app-arch/lzma-utils )"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
static? ( ${LIB_DEPEND} )
|
||||
app-arch/xz-utils"
|
||||
|
||||
src_prepare() {
|
||||
if ! use vanilla ; then
|
||||
use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
|
||||
EPATCH_SUFFIX="patch" \
|
||||
PATCHDIR="${WORKDIR}/patch" \
|
||||
EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
|
||||
@ -52,15 +54,33 @@ src_unpack() {
|
||||
# Also, it's not like we changed the usage on any of these things,
|
||||
# so let's just update the timestamps and skip the help2man step.
|
||||
set -- man/*.x
|
||||
tc-is-cross-compiler && touch ${@/%x/1}
|
||||
touch ${@/%x/1}
|
||||
|
||||
# Avoid perl dep for compiled in dircolors default #348642
|
||||
if ! has_version dev-lang/perl ; then
|
||||
touch src/dircolors.h
|
||||
touch ${@/%x/1}
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use static && append-ldflags -static
|
||||
src_configure() {
|
||||
local myconf=''
|
||||
if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
|
||||
export fu_cv_sys_stat_statfs2_bsize=yes #311569
|
||||
export gl_cv_func_realpath_works=yes #416629
|
||||
fi
|
||||
|
||||
export gl_cv_func_mknod_works=yes #409919
|
||||
use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
|
||||
use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
|
||||
use userland_BSD && myconf="${myconf} -program-prefix=g --program-transform-name=s/stat/nustat/"
|
||||
# kill/uptime - procps
|
||||
# groups/su - shadow
|
||||
# hostname - net-tools
|
||||
econf \
|
||||
--with-packager="Gentoo" \
|
||||
--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
|
||||
--with-packager-bug-reports="http://bugs.gentoo.org/" \
|
||||
--enable-install-program="arch" \
|
||||
--enable-no-install-program="groups,hostname,kill,su,uptime" \
|
||||
--enable-largefile \
|
||||
@ -69,8 +89,7 @@ src_compile() {
|
||||
$(use_enable acl) \
|
||||
$(use_enable xattr) \
|
||||
$(use_with gmp) \
|
||||
|| die "econf"
|
||||
emake || die "emake"
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_test() {
|
||||
@ -144,4 +163,15 @@ pkg_postinst() {
|
||||
rm -f "${ROOT}/bin/dircolors"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Help out users using experimental filesystems
|
||||
if grep -qs btrfs "${ROOT}"/etc/fstab /proc/mounts ; then
|
||||
case $(uname -r) in
|
||||
2.6.[12][0-9]|2.6.3[0-7]*)
|
||||
ewarn "You are running a system with a buggy btrfs driver."
|
||||
ewarn "Please upgrade your kernel to avoid silent corruption."
|
||||
ewarn "See: https://bugs.gentoo.org/353907"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user