mlot/alien
1
0
Fork 0
mirror of https://github.com/Project-OSS-Revival/alien.git synced 2026-04-24 14:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Use --target noarch instead of --target=noarch when building rpms.

Browse Source 
The latter used to work, but no longer does, due to some change in rpm or
     popt. It also has to come after the -bb.
   * Trap stderr of rpm and debian/rules building packages, and only display if
     the build fails.
This commit is contained in:
joey
2002-01-04 21:12:41 +00:00
parent 15f7f75dfd
commit ea55014024
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Alien/Package/Deb.pm
View File

@@ -422,7 +422,7 @@ sub build {
my $this=shift; my $this=shift;
chdir $this->unpacked_tree; chdir $this->unpacked_tree;
my $log=`debian/rules binary`; my $log=`debian/rules binary 2>&1`;
if ($?) { if ($?) {
die "Package build failed. Here's the log:\n", $log; die "Package build failed. Here's the log:\n", $log;
} }

8
Alien/Package/Rpm.pm
View File

@@ -348,14 +348,14 @@ sub build {
# This is the new command line arcgument to make noarch # This is the new command line arcgument to make noarch
# rpms. It appeared in rpm version 3. # rpms. It appeared in rpm version 3.
$opts="--target=noarch" if $rpmarch eq 'noarch'; $opts="--target noarch" if $rpmarch eq 'noarch';
} }
$opts.=" $ENV{RPMBUILDOPTS}" if exists $ENV{RPMBUILDOPTS}; $opts.=" $ENV{RPMBUILDOPTS}" if exists $ENV{RPMBUILDOPTS};
my $command="cd $dir; rpm $opts -bb ".$this->name."-".$this->version."-".$this->release.".spec >/dev/null"; my $command="cd $dir; rpm -bb $opts ".$this->name."-".$this->version."-".$this->release.".spec";
my $log=`$command`; my $log=`$command 2>&1`;
if ($?) { if ($?) {
die "Package build failed. Here's the log:\n", $log; die "Package build failed. Here's the log of the command ($command):\n", $log;
} }
return $rpm; return $rpm;

1
TODO
View File

@@ -1,5 +1,4 @@
* handling postinst script when converting to/from .slp packages. * handling postinst script when converting to/from .slp packages.
* solaris pkgadd package support. Useful on sparc linux
* alien needs to handle relocatable conffiles, partially relocatable * alien needs to handle relocatable conffiles, partially relocatable
packages, and packages that have maultiple parts that relocate packages, and packages that have maultiple parts that relocate
differently. differently.

10
debian/changelog vendored
View File

@@ -1,3 +1,13 @@
alien (7.31) unstable; urgency=low
* Use --target noarch instead of --target=noarch when building rpms.
The latter used to work, but no longer does, due to some change in rpm or
popt. It also has to come after the -bb.
* Trap stderr of rpm and debian/rules building packages, and only display if
the build fails.
-- Joey Hess <joeyh@debian.org> Fri, 4 Jan 2002 13:53:04 -0500
alien (7.30) unstable; urgency=low alien (7.30) unstable; urgency=low
* Thanks to the excellent work of Mark A. Hershberger <mah@everybody.org>, * Thanks to the excellent work of Mark A. Hershberger <mah@everybody.org>,