From dc18c31157be9d62484dc6a73aaca56cd0ff5b2a Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 30 Jul 2015 11:13:04 +0200 Subject: [PATCH] Drop old and bump Package-Manager: portage-2.2.14 RepoMan-Options: --force --- dev-embedded/u-boot-tools/ChangeLog | 9 +- dev-embedded/u-boot-tools/Manifest | 11 +-- .../files/u-boot-no-config.h.patch | 92 ------------------- .../u-boot-tools/u-boot-tools-2014.10.ebuild | 6 +- ....01.ebuild => u-boot-tools-2015.07.ebuild} | 21 ++--- 5 files changed, 25 insertions(+), 114 deletions(-) delete mode 100644 dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch rename dev-embedded/u-boot-tools/{u-boot-tools-2014.01.ebuild => u-boot-tools-2015.07.ebuild} (73%) diff --git a/dev-embedded/u-boot-tools/ChangeLog b/dev-embedded/u-boot-tools/ChangeLog index ce41108..455f9f8 100644 --- a/dev-embedded/u-boot-tools/ChangeLog +++ b/dev-embedded/u-boot-tools/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-embedded/u-boot-tools -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.26 2012/09/05 04:51:29 radhermit Exp $ +*u-boot-tools-2015.07 (30 Jul 2015) + + 30 Jul 2015; Mario Fetka +u-boot-tools-2015.07.ebuild, + -files/u-boot-no-config.h.patch, -u-boot-tools-2014.01.ebuild, + u-boot-tools-2014.10.ebuild: + Drop old and bump + *u-boot-tools-2014.01 (15 Oct 2014) *u-boot-tools-2014.10 (15 Oct 2014) diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest index 03b38cf..195c93e 100644 --- a/dev-embedded/u-boot-tools/Manifest +++ b/dev-embedded/u-boot-tools/Manifest @@ -1,10 +1,9 @@ -AUX u-boot-no-config.h.patch 2909 SHA256 a0a862b536d23b2fb110e48d0b7c8ad8e81dfaf50b5952485df490db4ec5a986 SHA512 ddd42863ea74918915846c7b1e561807904875860a33348e72458be85d86fa040ad9b44155de631b0b6731a16660defc88ef712b4ab94484c92d6535fbd76535 WHIRLPOOL 7340f72f16c4dfca164335dc4ccd733b11686962b3bfd8fd8669b20166351d1906885ba7bd2bc8b19210621715fd6b2a6fd7f42fa4e272e4b52bbbae780ec5aa AUX uboot-tools-01-drop-configh-from-tools.patch 732 SHA256 69a69e130350091a7cbc9102163d0e5468068e45a0534bdf49f2e7ec225fddad SHA512 09914602462df0265b0d3701e9c3711e23f74364d5ba564e5ed6d40a0a90a848c8357014dc6ae54fb663c894e8eac3ceca41cda0129866b72c5772e944bc55f6 WHIRLPOOL b50c7646a19cb2de6ca71519832c8fb676d4a6db42c371657f3897e887f1a03a5b454a4e021a7cbb336459fc068f2f598562e67ee1f7ec83892d985c5a02edca AUX uboot-tools-02-nostrip.patch 2193 SHA256 346a68cea01baf61de34efdc93dfe7d93d34de5a3fcb4cdc6257cf08c65d9cde SHA512 251c636272d1d90e42a8d67837de8a61aececf4ac49edcc5a70183606cb39682ea18afac40c982f8899350b97ad0a4e01495c497221ad3f1abf42039488dc9a0 WHIRLPOOL 2e142f77af0ecc662e6262ecf858dcc924d386533319c9b250e3ca35a96f0b9901cc77c70de99afcb1f61841ef66227540af0e7f70ed75801f28d74ce03b4984 -DIST u-boot-2014.01.tar.bz2 10180625 SHA256 cdaf8c81583abfa2e73da46cfcf87b0cbd9741d9aa766f3b905376e3652d543d SHA512 c6e4f6f9a2dae1a50b7dd94dad13ef5d0ce440c3f0401de3f0ecf907c8fca0ff183077ec3b2c4da42b0fa9775450b03571725c76dfd2419a4ee7b982c261ccb1 WHIRLPOOL 9964abde477ce54dfe0a0972920e19c6d60209e8a19819c98b955a9a8b23cc57ac8e687d9ced65411eb6ff1ac40121edac154e754b3b5a2f037cf3a7724de374 DIST u-boot-2014.10.tar.bz2 10217685 SHA256 d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71 SHA512 2cc51b54fbaa26a32ceb9559bcc2ce986163a06e1fcad1b8be236c3e3bcf1fcf6662e083efda76a58d769cd3e95544b0934ca8d02521568096fb290ee7617153 WHIRLPOOL ba00103ebbfac03d9ed6b806e62e8d88d45925b5388cb221b143727bf55a340f0dca7837ee181f47ee7b08701847427d5f9b2bdffdb19a9b60d67f90ef60a6df -DIST u-boot_2014.07+dfsg1-2.debian.tar.xz 57996 SHA256 86d69f4cfd252d27c9f89639f580815c321017395f6f6e7ce4091c1ed642e55d SHA512 7490a28862f026a06f5fc400b1d9c8324a435c364d9006b50511b8fa7fc1e57efe4914d36969094113fd22e4a4dbe1a13264cd9a61eab51dbe502ea770cb2d89 WHIRLPOOL 7e3a7ed7c0f09445765c619247715ab81d2c1492ae50d67fe3f397bb09feb47a10ce20f55e92614afbd4da02767aa7be7c174df8e38b8feb830c05bb39bf118c -EBUILD u-boot-tools-2014.01.ebuild 1360 SHA256 245bf428b69c286a94196257e42aeaa705a73618ac139919525efc6f1d510746 SHA512 96ad0d17d5d5486f9c3c0367054da8de109ddcc456e1bd6f20dd67abe8bd7859106463a2e95038e185aae9710bd98df519508ab6fc866c560756f9be0a341a54 WHIRLPOOL 2423c8e58328c78677ca0a9e484cea533c8a32d111e6dc4e367176d4fd63e1e53ebb7d56e549f85117ddec2a3e76db5b56fa96f27a8f1cddb433849b5ca8d252 -EBUILD u-boot-tools-2014.10.ebuild 1434 SHA256 436e987c67aca1f63e1dfc61388bff6ddd95225eb79acadab180842c1c6b6fac SHA512 8f495750e188efa77fc06043fad804b89049a5b55754092ecd717fb6da6351952facd1a53a118a34488776a598e03fd7d9fad5c86381ac9f865e6c759582a733 WHIRLPOOL ed084f4f8b4aab0dbdbe5b03bc37ca2e3266f50cd10dcc15c61a82e4d8cc48f1f6d08b2bb9161c2795bea49db96b698622758808aa52b95dd85e60a291147d29 -MISC ChangeLog 4585 SHA256 5d7b0ef2176ba027ffcb9479a54b80c7cb52808c96404b24ec3e942ec8a5d728 SHA512 1812aae7f509fe1f43314dfade02d09061384bdb3d1dd43868c16e1f2ee93417314703c549904600511fdad14f6488fc5eca643abcd90ee870843b8f311f6e56 WHIRLPOOL d58b9eafb5b0ba814f0d2ba82dbb31679e7a6140a9ec53ca26581f32a363df86e803ac0b7f377c2cd729cdf93e371f44be19b67c7e612e672942ef40f07a4f3e +DIST u-boot-2015.07.tar.bz2 9919961 SHA256 0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9 SHA512 40878f28c19f077bc83b82687c9f656c64ef2bdbbc3b4caf3f7ec657a7200ce212713cd5adbc0cb23379950fe804767d1efb9108cc8c33b66faa7c7d3a831ffe WHIRLPOOL cf870ce171c0e4a8980bfaa9bdd6e4e413d15aee57adb8ce8a49d8b7babe50bb65b1df2ae7cd2a1bdd944202b856d135d4d86e30eee441475e314a6f7dfa3499 +DIST u-boot_2014.10+dfsg1-5.debian.tar.xz 47948 SHA256 866bce5f28f981117b872922d578df97e358b3523b450dd88be5abb9d95dc191 SHA512 47dc28f916ec37108a195b4facfd429c8bd91a04c5ad0848d067a8587f13fb12becb76d79882897b97917d91a71aab9fade49dc14e85f43530e1ba4853771e45 WHIRLPOOL d34ecf842fe856b9cbee5860fa934312b999861617adbf98be987057ff7313c647075e68e51751a518b62da2bed090a4c8a6ef8b4c9debdce54f299231f30c45 +EBUILD u-boot-tools-2014.10.ebuild 1449 SHA256 2ed9403fe4ca6f05a69c0799a773f1f5e24ea2c38b5493517a263d31db36e024 SHA512 fe157cf3f72600d9d172a25cf287c59d0aa83dc30bb765573b3dcf839ae9d6c54402330777589fa93f43b2f6b3a6fe9fbeb404fe129d0bf38702146471810bda WHIRLPOOL 1b9b6918206e2dfb239466fae3e8361282114866f1c3e1609b61de976415c1795db6ffb20fbbff91edbdd4809e08811add08b17e7d7f4338e72205d1afa8f850 +EBUILD u-boot-tools-2015.07.ebuild 1268 SHA256 e6a8130b0b351c6b75c9cee96ae4dd40215fc1f0c7eaebe86a741eae6156f5e4 SHA512 f906f718ca311447da1b5352b246dbbe84c69361999503df8cb389691ff931c3da780265153c8a8e620abda9950998d99e8c11ffe125a9177fc9715991ce52eb WHIRLPOOL 12d4e1382ece2e274cfe245f47f8bb4910476d4271c064253a85e0609ed83721dbc98d80e54c79afb2538dac9dfbd562bd58faee57e8f9d264a128813f8d2cb4 +MISC ChangeLog 4820 SHA256 dec873cc4fce9af660ded8a6bfb5bf91d607c514e5c2ef8a1f6ffc92d195ea03 SHA512 10f2ecdab11886c09119799135c36823cd72bbd135bca70e7300bd45700d82e6bdf32e2b7203860ccdd8489d74afc0446f05ea20348e52aa5394c4d18f27b075 WHIRLPOOL 9612654578a5be1b17dfbc576ec035ccabd795dedf026d48e16fe856efd9a0244ab7702d4de1a6b5fd92214ef39e0e896c79cd3a61f010fac9a8583b98bada6e MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe diff --git a/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch b/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch deleted file mode 100644 index 1009ab0..0000000 --- a/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch +++ /dev/null @@ -1,92 +0,0 @@ -This patch has been reverted later on by -http://git.denx.de/?p=u-boot.git;a=commit;h=e3c52f2b8779469c843eb79282396f1a5ca3fef5 - -but we still need it to build the tools without having to configure -a full u-boot environment. - -Signed-off-by: Markos Chandras - -From: Mike Frysinger -Date: Sat, 10 Nov 2012 19:47:47 +0000 (+0000) -Subject: fw_env: fix building w/out a config.h -X-Git-Tag: v2013.01-rc3~19 -X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=92ace272d06cec1d7f1533bb9edf914fb5845fba;hp=7a546db2ffc6a713fb8009d8246c29da5420f6a7 - -fw_env: fix building w/out a config.h - -Signed-off-by: Mike Frysinger -Acked-by: Peter Korsgaard ---- - -diff --git a/tools/env/Makefile b/tools/env/Makefile -index 0e798e0..e6dc5f3 100644 ---- a/tools/env/Makefile -+++ b/tools/env/Makefile -@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk - HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c - HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c - HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c --HEADERS := fw_env.h $(OBJTREE)/include/config.h -+HEADERS := fw_env.h - - # Compile for a hosted environment on the target - HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -@@ -36,6 +36,15 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ - -DUSE_HOSTCC \ - -DTEXT_BASE=$(TEXT_BASE) - -+# Pass CONFIG_xxx settings via the command line so that we can build w/out -+# a config.h file existing in the first place. Useful for generic builds. -+CONFIG_VARS_TO_PASS = \ -+ ENV_OVERWRITE \ -+ OVERWRITE_ETHADDR_ONCE \ -+ ETHADDR -+HOSTCPPFLAGS += \ -+ $(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x)))) -+ - ifeq ($(MTD_VERSION),old) - HOSTCPPFLAGS += -DMTD_OLD - endif -diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h -index a1a6807..19703c7 100644 ---- a/tools/env/fw_env.h -+++ b/tools/env/fw_env.h -@@ -21,15 +21,6 @@ - * MA 02111-1307 USA - */ - --/* Pull in the current config to define the default environment */ --#ifndef __ASSEMBLY__ --#define __ASSEMBLY__ /* get only #defines from config.h */ --#include --#undef __ASSEMBLY__ --#else --#include --#endif -- - /* - * To build the utility with the static configuration - * comment out the next line. -@@ -52,22 +43,6 @@ - #define DEVICE2_ENVSECTORS 2 - #endif - --#ifndef CONFIG_BAUDRATE --#define CONFIG_BAUDRATE 115200 --#endif -- --#ifndef CONFIG_BOOTDELAY --#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ --#endif -- --#ifndef CONFIG_BOOTCOMMAND --#define CONFIG_BOOTCOMMAND \ -- "bootp; " \ -- "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \ -- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ -- "bootm" --#endif -- - extern int fw_printenv(int argc, char *argv[]); - extern char *fw_getenv (char *name); - extern int fw_setenv (int argc, char *argv[]); diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2014.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2014.10.ebuild index 78a9536..e64fb2e 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2014.10.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2014.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2011.12.ebuild,v 1.4 2012/08/08 15:09:18 nativemad Exp $ @@ -7,7 +7,7 @@ EAPI="4" inherit eutils toolchain-funcs MY_P="u-boot-${PV/_/-}" -DEB_PV="2014.07+dfsg1-2" +DEB_PV="2014.10+dfsg1-5" DESCRIPTION="utilities for working with Das U-Boot" HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome" SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2 @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 arm ~x86" IUSE="" S=${WORKDIR}/${MY_P} diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2015.07.ebuild similarity index 73% rename from dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild rename to dev-embedded/u-boot-tools/u-boot-tools-2015.07.ebuild index b168961..4f8cb0a 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2015.07.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild,v 1.4 2014/05/03 14:44:01 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2011.12.ebuild,v 1.4 2012/08/08 15:09:18 nativemad Exp $ -EAPI="5" +EAPI="4" inherit eutils toolchain-funcs MY_P="u-boot-${PV/_/-}" -DEB_PV="2014.07+dfsg1-2" +DEB_PV="2014.10+dfsg1-5" DESCRIPTION="utilities for working with Das U-Boot" HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome" SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2 @@ -15,21 +15,18 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm x86" +KEYWORDS="~amd64 arm ~x86" IUSE="" S=${WORKDIR}/${MY_P} -src_prepare() { - sed -i "s:-g ::" tools/Makefile || die - # Make sure we find local u-boot headers first #429302 - ln -s ../include/image.h tools/ || die - epatch "${FILESDIR}"/u-boot-no-config.h.patch -} - src_compile() { + # Unset a few KBUILD variables. Bug #540476 + unset KBUILD_OUTPUT KBUILD_SRC + emake defconfig emake \ HOSTSTRIP=: \ + STRIP=: \ HOSTCC="$(tc-getCC)" \ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \ HOSTLDFLAGS="${LDFLAGS}" \