diff options
author | Michal Hrušecký <miska@gentoo.org> | 2014-01-28 13:35:28 +0000 |
---|---|---|
committer | Michal Hrušecký <miska@gentoo.org> | 2014-01-28 13:35:28 +0000 |
commit | 5213e94249c89fca9e80f1d54d7d152e8cf53a78 (patch) | |
tree | 3aea975e153b4ce2f418f07a6482726d7f9d746b /dev-util | |
parent | version bump (diff) | |
download | historical-5213e94249c89fca9e80f1d54d7d152e8cf53a78.tar.gz historical-5213e94249c89fca9e80f1d54d7d152e8cf53a78.tar.bz2 historical-5213e94249c89fca9e80f1d54d7d152e8cf53a78.zip |
r1 ebuild with patch replacing paths only where needed
* fixes running checks during build of openSUSE packages
updated copyright everywhere
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD39CB7C5
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/suse-build/ChangeLog | 13 | ||||
-rw-r--r-- | dev-util/suse-build/Manifest | 24 | ||||
-rw-r--r-- | dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch | 248 | ||||
-rw-r--r-- | dev-util/suse-build/suse-build-2013.10.15-r1.ebuild | 63 | ||||
-rw-r--r-- | dev-util/suse-build/suse-build-2013.10.15.ebuild | 4 | ||||
-rw-r--r-- | dev-util/suse-build/suse-build-9999.ebuild | 4 |
6 files changed, 334 insertions, 22 deletions
diff --git a/dev-util/suse-build/ChangeLog b/dev-util/suse-build/ChangeLog index 1024c989c880..b6c52796042f 100644 --- a/dev-util/suse-build/ChangeLog +++ b/dev-util/suse-build/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-util/suse-build -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.19 2013/11/02 09:05:08 scarabeus Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/ChangeLog,v 1.20 2014/01/28 13:35:22 miska Exp $ + +*suse-build-2013.10.15-r1 (28 Jan 2014) + + 28 Jan 2014; Michal Hrusecky <miska@gentoo.org> suse-build-2013.10.15.ebuild, + +suse-build-2013.10.15-r1.ebuild, suse-build-9999.ebuild, + +files/suse-build-20131015-libexec-paths.patch: + r1 ebuild with patch replacing paths only where needed + * fixes running checks during build of openSUSE packages + updated copyright everywhere 02 Nov 2013; Tomáš Chvátal <scarabeus@gentoo.org> -suse-build-2013.05.17-r1.ebuild, suse-build-2013.10.15.ebuild: diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest index f7cfe9aaef5c..5d1791635388 100644 --- a/dev-util/suse-build/Manifest +++ b/dev-util/suse-build/Manifest @@ -1,25 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX suse-build-20131015-libexec-paths.patch 9154 SHA256 cf99f71144e0dc1f9d9069acb6d648f284c22fb66d731ffd7614509ec2830ec1 SHA512 754809455b59bb2427a1129d311210809acc0132a76b8749806f85b0c0a329e477bf8891878d3be983f24e545f76f7569475bf80a729680e4566b57bf1ee0e86 WHIRLPOOL d9e41702106c15faf11cc58831229127038e224fd112eeab3d4f409898cadb10f5bcb9996bd3684f9c34bcf485fe9c8c605d8f3fb35a2026bb246bb975088ced DIST obs-build-20131015.tar.gz 155183 SHA256 ffa0506a8b7f55fa3136ddbf45ac963ab7e56140cb3b33bc50ebf91ec497e5f2 SHA512 bd5fd71c4c7e5b8904b8bda6b3246c74a8ccf1bc6c44c365f09974f3dc4a90b2306549f19a5d0748968a0bdcea0e15a5c9f577476ccb5120b531a543f72241b0 WHIRLPOOL 0d9641a7287a8aae4bc23ad0a15394d93ee95e642e56bf3c5ac19b69efadca127f241e6a2f91db6f5ce8706b4446a249a675bd65b0c2c175b5ef8cef680f9d1e -EBUILD suse-build-2013.10.15.ebuild 1593 SHA256 e3f3462d0cd5b37e1511e2e5583ec6b7ac8f8ffd14e898d6951213f9ba72ed59 SHA512 c8e2ddfa545775a4a647de54d8846a249f5cf10193c6a28d1d3a8c8cd3a756e7c34c0e6628eac88b7a883875c325ddf72e2beb171f5f65b4adb24e647acf4fcb WHIRLPOOL 5f9217b6c5038322a7ca1098d680d5d7508e98103c8756391bc99420e6915b9ca7124c22c1ee13c5f00212655b02f59788d5e106192121a8e8680c11c250049e -EBUILD suse-build-9999.ebuild 1587 SHA256 21f36b04a353bef44af5d2b35d570fb86fce669cbe07d783d0fca24d3d6f0b8c SHA512 9ff93e4643983a4223b063291a8b92ff0ebc49056beaec43640e3730c14f5ac312452e7a42e27fcdb98817420e748a98909867d92ec963caacd7e044cfd05172 WHIRLPOOL ea50d1e56866aee8acb3a09182fd49937f1eb03bb580d638205151b9b513b59122f8b35805a6140bffc4fc93f41310eda9931ad463b356a24a42911a530b0b05 -MISC ChangeLog 3968 SHA256 a888bab1e0f2ac6f8e2681904bbbdc9308781f76c408fc4c68d554a2e2218c8d SHA512 a4da4e8582e72245c366901038dbbe9900023b9579bcaee5944dd26305109bf4c3ea45535122b67f251c8f21d2ff9cbca99130ad845be7360f08c0bbbea249ef WHIRLPOOL 4df67439413d8c97742404186b10368cbf5c82a325ce7cf42bbfc584bdfd294ca3533e31c01457acba1c51dc7f0efbd4924fb8c59599ec82697d10aecc0fb93d +EBUILD suse-build-2013.10.15-r1.ebuild 1597 SHA256 c40239cf065ee37b3915748f0ecb2b0552c8fd512e21b05b45a2cef0b2d5927f SHA512 7002f7d6dad99476a14027ada9b31744fb2795f213551ec83eab1ec8efb79f7f2fd51e8da850b3cc269b1acdd71d4891c439a7a87f433a22ce3a31354be7ecbe WHIRLPOOL 5abe612b31f4b78863b35eaf1b1a57d459c97ec6ff6292ea1c49550c6f57d21cd001a153b57a39fe43cf48293def94805dd934bedef9a4f9931f0d57d8046b85 +EBUILD suse-build-2013.10.15.ebuild 1589 SHA256 50641863a2e4621058e6c227053b0298956050baf76cd47cdd0bb555d4b59955 SHA512 0e661af7140a40eb47f13f51f7b5d25aef7b62e613221fc9e66d76de71ae0823cb85113da3e3e122d7edab658d6457f9bc6e2001870b445deb4df6c9733b7458 WHIRLPOOL 0c5a1b20a05184ced6747461be74cffe528d7e04188b8fa44c80dbe12163c3b3531e9fbff3873e8cd5d7e2d5016e51d205b97d80b664cee000ab24aab389fd7d +EBUILD suse-build-9999.ebuild 1584 SHA256 4944b2efb155449fcc23ab8746a1e464653b914b1ba43cdd7cbcffac4582d877 SHA512 b7fe4db0f494011d6963f609a98443c248ecb8a16d169004ab393978644c612f6fa604c30c47f4f775ae5f87d3a9236ecb6bf8b178429b57571b77d62f7c1bad WHIRLPOOL 5d12d82c0bb31f594690d6916402f623ff4dc4ee61861a98cab94623c41d1bc474ff00d29622df136ea26c57ae2fac18a2b8ce1e5630e23557ebf81fd16bc657 +MISC ChangeLog 4343 SHA256 c7c1296265cfb45ef95d4489c04e092f5f00963ac629063e4feed4bc28977415 SHA512 cdec2fe9976f3860a0a649aefd372fe5a9dd467a6011bfa79fec08c4099f13cd29e829b7de0ecde928d09ebe79a26c3e7047ad1ff73d145de1c9d7e246ba6afa WHIRLPOOL 70c29f22d771c426dd9fb13b88fb818d437f930b8fb999e3ab251177482241ff4ef62f15b0571862fdfe1c5ece76868f22d1b1e92e87a42eaf75c58d7ff0a64a MISC metadata.xml 409 SHA256 cc5c5706ac5406afec663da06a93e4c91f96c2ad3dce51e7a6769d8da9031205 SHA512 e27aada2ced11515a108f0203cad9a6cede66c3d33ea91846113a118933107024fabefb5cdfdb8d6159058d4fd3e962d29a205fc637df976a156582e48e60e7b WHIRLPOOL c62713b4d1e52190ba07d06e604b672244efbbe76d95b29565487035a4e77956b348daa59355011c80bfae0860435844285a60c76b9714c5c4fdeb77f6f1f4b4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJSdMBrAAoJEOSiRoyO7jvolBQP/3unxQjTmjRl1na20ajom/Zj -M2VIUN/uQy63QM0e4WKPSLr93Q/tz1gtw0LmUdA5vaV9fQ9vXfHB+H292odBrFrY -KA6FxbDb76yD16RizZSKkEhFUnt30BKCepTIYZztogmGjj7pPpvqRLuccgISUn+/ -1SRG7Gh7TSOyzarENloAO76Kpom40WoZRkfcEKU445k+XIy5v1wwUi7TKbr3SSt8 -PEp6bYPzpXNj+IlP9+zCgT/f6QFgmO3/z8PrImGfVx2w8yB1jX+jchGBOqEFb4W8 -T97KKtg0vUKAqWGtYndlCVVbhMzo3lFXKZqzjTeCtSERyHhSMfzJtEAaxG1tptSq -UPAKTvt8XrPQisJA49ydecPxGqn8s0FgRoEVCUJilMeeTjv2lXJfto5OWj9bqxdk -c+WLqxk8cE9GqP796pAguTFoV/SWMMElfuHJ0s2rZFulfpMdcTo1jtp8o0w9F5Ws -IGAZtdfrC74GX+FOZy4LN0hsj0PRWVYT1glsZpnBg9xAYME63F0McPeLX89YDIhc -PcKHkDEWqthiLZjBDaQ+xZnvqtzRCXB81/F7AMeSu78sgJqcNgMgn4olX/zW1srL -0IWAbdjzJBjdL0BRvaoyAruGX+jnImgJmKqQHTzPcn6zng2W6nNZRf5yzLojY4ap -/NMct1zTmpY2VBw03xoJ -=7Gcc +iF4EAREIAAYFAlLnshsACgkQpFCI79Oct8W5UwEAryDaCNUs3LJ7pATmH8b1trdp +uIaeM/8cXoo5tMq99GYA+QEW4vXu8NM8B8KR7mVj85VDtRwohqorhhTRwdim83DP +=wmWY -----END PGP SIGNATURE----- diff --git a/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch b/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch new file mode 100644 index 000000000000..10e9bd880479 --- /dev/null +++ b/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch @@ -0,0 +1,248 @@ +diff -Naru obs-build-20131015.orig/build obs-build-20131015/build +--- obs-build-20131015.orig/build 2014-01-28 12:31:51.126824118 +0000 ++++ obs-build-20131015/build 2014-01-28 12:31:23.973477260 +0000 +@@ -12,7 +12,7 @@ + exec /.build/build "$@" + fi + +-test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build ++test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build + test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root + test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs" + +diff -Naru obs-build-20131015.orig/createarchdeps obs-build-20131015/createarchdeps +--- obs-build-20131015.orig/createarchdeps 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/createarchdeps 2014-01-28 12:31:23.976477299 +0000 +@@ -3,7 +3,7 @@ + # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@gmail.com> + + BEGIN { +- unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build"); ++ unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build"); + } + + use strict; +diff -Naru obs-build-20131015.orig/createrepomddeps obs-build-20131015/createrepomddeps +--- obs-build-20131015.orig/createrepomddeps 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/createrepomddeps 2014-01-28 12:31:23.976477299 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use strict; +diff -Naru obs-build-20131015.orig/createrpmdeps obs-build-20131015/createrpmdeps +--- obs-build-20131015.orig/createrpmdeps 2014-01-28 12:31:51.129824157 +0000 ++++ obs-build-20131015/createrpmdeps 2014-01-28 12:31:23.976477299 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use Build; +diff -Naru obs-build-20131015.orig/createyastdeps obs-build-20131015/createyastdeps +--- obs-build-20131015.orig/createyastdeps 2014-01-28 12:31:51.127824131 +0000 ++++ obs-build-20131015/createyastdeps 2014-01-28 12:31:23.974477273 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use Build; +diff -Naru obs-build-20131015.orig/download obs-build-20131015/download +--- obs-build-20131015.orig/download 2014-01-28 12:31:51.129824157 +0000 ++++ obs-build-20131015/download 2014-01-28 12:31:23.976477299 +0000 +@@ -3,7 +3,7 @@ + use Net::SSL (); + BEGIN { + $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0, +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use LWP::UserAgent; +diff -Naru obs-build-20131015.orig/expanddeps obs-build-20131015/expanddeps +--- obs-build-20131015.orig/expanddeps 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/expanddeps 2014-01-28 12:31:23.975477286 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use strict; +diff -Naru obs-build-20131015.orig/getbinaryid obs-build-20131015/getbinaryid +--- obs-build-20131015.orig/getbinaryid 2014-01-28 12:31:51.129824157 +0000 ++++ obs-build-20131015/getbinaryid 2014-01-28 12:31:23.976477299 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use Build; +diff -Naru obs-build-20131015.orig/getchangetarget obs-build-20131015/getchangetarget +--- obs-build-20131015.orig/getchangetarget 2014-01-28 12:31:51.129824157 +0000 ++++ obs-build-20131015/getchangetarget 2014-01-28 12:31:23.976477299 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use strict; +diff -Naru obs-build-20131015.orig/getmacros obs-build-20131015/getmacros +--- obs-build-20131015.orig/getmacros 2014-01-28 12:31:51.129824157 +0000 ++++ obs-build-20131015/getmacros 2014-01-28 12:31:23.976477299 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use Build; +diff -Naru obs-build-20131015.orig/getoptflags obs-build-20131015/getoptflags +--- obs-build-20131015.orig/getoptflags 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/getoptflags 2014-01-28 12:31:23.976477299 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use strict; +diff -Naru obs-build-20131015.orig/gettype obs-build-20131015/gettype +--- obs-build-20131015.orig/gettype 2014-01-28 12:31:51.127824131 +0000 ++++ obs-build-20131015/gettype 2014-01-28 12:31:23.974477273 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use strict; +diff -Naru obs-build-20131015.orig/changelog2spec obs-build-20131015/changelog2spec +--- obs-build-20131015.orig/changelog2spec 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/changelog2spec 2014-01-28 12:31:23.975477286 +0000 +@@ -5,7 +5,7 @@ + # + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use Date::Parse; +diff -Naru obs-build-20131015.orig/init_buildsystem obs-build-20131015/init_buildsystem +--- obs-build-20131015.orig/init_buildsystem 2014-01-28 12:31:51.125824105 +0000 ++++ obs-build-20131015/init_buildsystem 2014-01-28 12:31:23.973477260 +0000 +@@ -16,7 +16,7 @@ + export YAST_IS_RUNNING="instsys" + export DEBIAN_FRONTEND=noninteractive + export DEBIAN_PRIORITY=critical +-export BUILD_DIR=${BUILD_DIR:-/usr/lib/build} ++export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build} + # need to restore build root owner for non-root builds + browner=0 + definesnstuff=() +diff -Naru obs-build-20131015.orig/initvm.c obs-build-20131015/initvm.c +--- obs-build-20131015.orig/initvm.c 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/initvm.c 2014-01-28 12:31:23.975477286 +0000 +@@ -53,9 +53,10 @@ + #define SYSFS_BINFMT_MISC_REG "/proc/sys/fs/binfmt_misc/register" + #define SYSFS_BINFMT_MISC_STAT "/proc/sys/fs/binfmt_misc/status" + +-/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */ ++/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */ + #define BINFMT_REGF_0 "/.build/qemu-reg" +-#define BINFMT_REGF_1 "/usr/lib/build/qemu-reg" ++#define BINFMT_REGF_1 "/usr/libexec/suse-build/qemu-reg" ++#define BINFMT_REGF_2 "/usr/lib/build/qemu-reg" + #define BUILD "/.build/build" + + /* useful constant arrays */ +@@ -307,9 +308,13 @@ + fprintf(stderr, "%s: failed. Trying alternate binfmt file\n", + BINFMT_REGF_0); + if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) { +- fprintf(stderr, "%s: binfmt registration failed\n", ++ fprintf(stderr, "%s: failed. Trying alternate binfmt file\n", + BINFMT_REGF_1); +- exit(1); ++ if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) { ++ fprintf(stderr, "%s: binfmt registration failed\n", ++ BINFMT_REGF_2); ++ exit(1); ++ } + } + } + } +diff -Naru obs-build-20131015.orig/mkdrpms obs-build-20131015/mkdrpms +--- obs-build-20131015.orig/mkdrpms 2014-01-28 12:31:51.127824131 +0000 ++++ obs-build-20131015/mkdrpms 2014-01-28 12:31:23.974477273 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, '/usr/lib/build'; ++ unshift @INC, '/usr/libexec/suse-build'; + unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'}; + } + +diff -Naru obs-build-20131015.orig/order obs-build-20131015/order +--- obs-build-20131015.orig/order 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/order 2014-01-28 12:31:23.975477286 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use Build; +diff -Naru obs-build-20131015.orig/spectool obs-build-20131015/spectool +--- obs-build-20131015.orig/spectool 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/spectool 2014-01-28 12:31:23.975477286 +0000 +@@ -116,7 +116,7 @@ + my $builddir; + + BEGIN { +- $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + unshift @INC, $builddir; + } + +diff -Naru obs-build-20131015.orig/substitutedeps obs-build-20131015/substitutedeps +--- obs-build-20131015.orig/substitutedeps 2014-01-28 12:31:51.128824144 +0000 ++++ obs-build-20131015/substitutedeps 2014-01-28 12:31:23.976477299 +0000 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + BEGIN { +- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); ++ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); + } + + use strict; diff --git a/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild b/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild new file mode 100644 index 000000000000..8b748d0b8a89 --- /dev/null +++ b/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.10.15-r1.ebuild,v 1.1 2014/01/28 13:35:22 miska Exp $ + +EAPI=5 + +EGIT_REPO_URI="git://github.com/openSUSE/obs-build.git" + +if [[ "${PV}" == "9999" ]]; then + EXTRA_ECLASS="git-2" +else + OBS_PACKAGE="build" + OBS_PROJECT="openSUSE:Tools" + EXTRA_ECLASS="obs-download" +fi + +inherit eutils ${EXTRA_ECLASS} +unset EXTRA_ECLASS + +DESCRIPTION="Script to build SUSE Linux RPMs" +HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build" + +[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="symlink" +[[ "${PV}" == "9999" ]] || \ +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + virtual/perl-Digest-MD5 + virtual/perl-Getopt-Long + dev-perl/XML-Parser + dev-perl/TimeDate + app-shells/bash + app-arch/cpio + app-arch/rpm +" + +S="${WORKDIR}/${PN/suse/obs}-${PV//.}" + +src_prepare() { + epatch "${FILESDIR}/suse-build-20131015-libexec-paths.patch" +} + +src_compile() { :; } + +src_install() { + emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install + cd "${ED}"/usr + find bin -type l | while read i; do + mv "${i}" "${i/bin\//bin/suse-}" + use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}" + done + find share/man/man1 -type f | while read i; do + mv "${i}" "${i/man1\//man1/suse-}" + use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}" + done + + # create symlink for default build config + dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf +} diff --git a/dev-util/suse-build/suse-build-2013.10.15.ebuild b/dev-util/suse-build/suse-build-2013.10.15.ebuild index 90fd2c33b21e..50b0dfe938aa 100644 --- a/dev-util/suse-build/suse-build-2013.10.15.ebuild +++ b/dev-util/suse-build/suse-build-2013.10.15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.10.15.ebuild,v 1.2 2013/11/02 09:05:08 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-2013.10.15.ebuild,v 1.3 2014/01/28 13:35:22 miska Exp $ EAPI=5 diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild index 0015dd96eced..d90e89698d7f 100644 --- a/dev-util/suse-build/suse-build-9999.ebuild +++ b/dev-util/suse-build/suse-build-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.9 2013/11/02 09:03:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/suse-build/suse-build-9999.ebuild,v 1.10 2014/01/28 13:35:22 miska Exp $ EAPI=5 |