Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #24 from jianingy/debian-issues

fixed build issues of debian/ubuntu
  • Loading branch information...
commit 78f83d5f4094ee7001850bf93639e232a099f30d 2 parents fb5eaf1 + 1fd6573
Noah Meyerhans nmeyerhans authored
13 index.yaml
View
@@ -1,9 +1,10 @@
default:
- arch: noarch
name: multipkg
version: '1.2'
summary: Automation for package builds (supports RPM, deb)
buildprefix: /usr
+rpm:
+ arch: noarch
provides:
- Seco::Multipkg
- perl-seco-class
@@ -13,3 +14,13 @@ default:
- subversion-perl
- perl-Git
- perl-Error
+deb:
+ arch: all
+ provides:
+ - perl-seco-class
+ - perl-seco-cpan
+ requires:
+ - libfile-fnmatch-perl
+ - libyaml-syck-perl
+ - libsvn-perl
+ - liberror-perl
4 root/usr/share/multipkg/default.yaml
View
@@ -4,12 +4,8 @@ default:
perl: '/usr/bin/perl'
version: '0.0001'
shebangmunge: 1
- arch: i686 x86_64
os_specific: no
-deb:
- perl: '/usr/local/bin/perl'
-
rpm:
autoreqprov: no
epoch: 20
8 root/usr/share/multipkg/templates/control.template
View
@@ -0,0 +1,8 @@
+Package: %name%
+Version: %version%-%release%
+Architecture: %arch%
+Depends: %requirelist%
+Maintainer: %whoami%
+Source: %name%
+Description:
+ %summary%
2  scripts/build
View
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ "$PERL" = "" ]; then
+if [ ! -x "$PERL" ]; then
PERL=/usr/bin/perl
fi
if [ "$PREFIX" = "" ]; then
12 source/lib/Seco/Multipkg.pm
View
@@ -803,6 +803,11 @@ sub makepackage {
$self->info->data->{rpmtemprepo} = $self->tmpdir . "/rpm";
+ if ( !$self->info->data->{arch} ) {
+ $self->info->data->{arch} = `arch`;
+ chomp $self->info->data->{arch};
+ }
+
$self->template_file( $self->info->confdir . "/templates/spec.template",
$self->tmpdir . "/spec" );
@@ -970,7 +975,12 @@ sub makepackage {
mkdir $self->installdir . "/DEBIAN"
unless ( -d $self->installdir . "/DEBIAN" );
- $self->template_file( $self->info->confdir . "/control.template",
+ if ( !$self->info->data->{arch} ) {
+ $self->info->data->{arch} = `dpkg --print-architecture`;
+ chomp $self->info->data->{arch};
+ }
+
+ $self->template_file( $self->info->confdir . "/templates/control.template",
$self->installdir . "/DEBIAN/control" );
my %trans = (
Please sign in to comment.
Something went wrong with that request. Please try again.