jlec 14/10/09 09:33:40 Added: suse-build-2014.09.18-libexec-paths.patch Log: dev-util/suse-build: Version BUmp (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.1 dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch?rev=1.1&content-type=text/plain Index: suse-build-2014.09.18-libexec-paths.patch =================================================================== build | 2 +- changelog2spec | 2 +- createarchdeps | 2 +- createrepomddeps | 2 +- createrpmdeps | 2 +- createyastdeps | 2 +- download | 2 +- expanddeps | 2 +- getbinaryid | 2 +- init_buildsystem | 0 initvm.c | 13 +++++++++---- mkdrpms | 2 +- order | 2 +- spectool | 2 +- substitutedeps | 2 +- 15 files changed, 22 insertions(+), 17 deletions(-) diff --git a/build b/build old mode 100755 new mode 100644 index 9f9fb72..e88f5b6 --- a/build +++ b/build @@ -13,7 +13,7 @@ if test "$0" = /sbin/init ; then fi test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build -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 --git a/changelog2spec b/changelog2spec old mode 100755 new mode 100644 index 4b94798..b87f4e1 --- a/changelog2spec +++ b/changelog2spec @@ -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 --git a/createarchdeps b/createarchdeps old mode 100755 new mode 100644 index 94efdb1..5e6795c --- a/createarchdeps +++ b/createarchdeps @@ -3,7 +3,7 @@ # Archlinux support, based on the GSoC work of Nikolay Rysev <[email protected]> BEGIN { - unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build"); + unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build"); } use strict; diff --git a/createrepomddeps b/createrepomddeps old mode 100755 new mode 100644 index fad84e5..f2292a6 --- a/createrepomddeps +++ b/createrepomddeps @@ -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/createrpmdeps b/createrpmdeps old mode 100755 new mode 100644 index c8c796d..c890df1 --- a/createrpmdeps +++ b/createrpmdeps @@ -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 --git a/createyastdeps b/createyastdeps old mode 100755 new mode 100644 index 43c83e7..094c532 --- a/createyastdeps +++ b/createyastdeps @@ -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 --git a/download b/download old mode 100755 new mode 100644 index b0a7c1f..d08770f --- a/download +++ b/download @@ -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 --git a/expanddeps b/expanddeps old mode 100755 new mode 100644 index 48116d8..67caa5f --- a/expanddeps +++ b/expanddeps @@ -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/getbinaryid b/getbinaryid old mode 100755 new mode 100644 index 55c57f6..8f06579 --- a/getbinaryid +++ b/getbinaryid @@ -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 --git a/init_buildsystem b/init_buildsystem old mode 100755 new mode 100644 diff --git a/initvm.c b/initvm.c index 55686ea..17ce70c 100644 --- a/initvm.c +++ b/initvm.c @@ -54,9 +54,10 @@ const int n_fields = 8; #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 */ @@ -324,9 +325,13 @@ int main(int argc, char* argv[], char* env[]) 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 --git a/mkdrpms b/mkdrpms old mode 100755 new mode 100644 index b3c13b3..11b929c --- a/mkdrpms +++ b/mkdrpms @@ -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 --git a/order b/order old mode 100755 new mode 100644 index 2236b46..fd2ebe7 --- a/order +++ b/order @@ -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 --git a/spectool b/spectool old mode 100755 new mode 100644 index ef05859..24bd500 --- a/spectool +++ b/spectool @@ -116,7 +116,7 @@ the algorithm is prepended with colon to the check sum. my $builddir; BEGIN { - $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); + $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build'); unshift @INC, $builddir; } diff --git a/substitutedeps b/substitutedeps old mode 100755 new mode 100644 index 54e540c..1f7f7ab --- a/substitutedeps +++ b/substitutedeps @@ -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;
