null31
/
aab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86_64 -> amd64 for consistency

This commit is contained in:
Wolfgang Bumiller 2017-03-17 15:18:13 +01:00
parent ac5c32c76f
commit 0cff4ef1b5
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -1,22 +1,22 @@
TODAY != date '+%Y%M%d' TODAY != date '+%Y%M%d'
VERSION := $(TODAY)-1 VERSION := $(TODAY)-1
V_x86_64 := $(VERSION)_x86_64 V_amd64 := $(VERSION)_amd64
V_i686 := $(VERSION)_i686 V_i686 := $(VERSION)_i686
PERL := perl -I. PERL := perl -I.
all: all:
@echo The following targets are available: @echo The following targets are available:
@echo ' $(MAKE) base-x86_64' @echo ' $(MAKE) base-amd64'
@echo ' $(MAKE) base-i686' @echo ' $(MAKE) base-i686'
@echo ' $(MAKE) default (same as make base-x86_64)' @echo ' $(MAKE) default (same as make base-amd64)'
.PHONY: default .PHONY: default
default: base-x86_64 default: base-amd64
# we should always regenerate this: # we should always regenerate this:
.PHONY: aab.conf aab.conf.x86_64 aab.conf.i686 .PHONY: aab.conf aab.conf.amd64 aab.conf.i686
aab.conf: aab.conf:
echo 'Name: archlinux-base' > aab.conf echo 'Name: archlinux-base' > aab.conf
echo 'Version: $(VERSION)' >> aab.conf echo 'Version: $(VERSION)' >> aab.conf
@ -24,14 +24,14 @@ aab.conf:
echo 'Maintainer: Proxmox Support Team <support@proxmox.com>' >> aab.conf echo 'Maintainer: Proxmox Support Team <support@proxmox.com>' >> aab.conf
echo 'Source: http://archlinux.cu.be/$$repo/os/$$arch' >> aab.conf echo 'Source: http://archlinux.cu.be/$$repo/os/$$arch' >> aab.conf
aab.conf.x86_64: aab.conf aab.conf.amd64: aab.conf
echo 'Architecture: x86_64' >> aab.conf echo 'Architecture: amd64' >> aab.conf
aab.conf.i686: aab.conf aab.conf.i686: aab.conf
echo 'Architecture: i686' >> aab.conf echo 'Architecture: i686' >> aab.conf
.PHONY: base-x86_64 .PHONY: base-amd64
base-x86_64: archlinux-base_$(V_x86_64).tar.gz base-amd64: archlinux-base_$(V_amd64).tar.gz
archlinux-base_$(V_x86_64).tar.gz: aab.conf.x86_64 archlinux-base_$(V_amd64).tar.gz: aab.conf.amd64
echo 'Headline: ArchLinux base image.' >> aab.conf echo 'Headline: ArchLinux base image.' >> aab.conf
$(MAKE) build-current $(MAKE) build-current

6
PVE/AAB.pm
View File

@ -117,6 +117,8 @@ sub read_config {
die "unable to parse config file" if $rec; die "unable to parse config file" if $rec;
$res->{architecture} = 'amd64' if $res->{architecture} eq 'x86_64';
return $res; return $res;
} }
@ -236,10 +238,12 @@ sub initialize {
$fh = IO::File->new($self->{'pacman.conf'}, O_WRONLY|O_CREAT|O_EXCL) || $fh = IO::File->new($self->{'pacman.conf'}, O_WRONLY|O_CREAT|O_EXCL) ||
die "unable to write pacman config file $self->{'pacman.conf'} - $!"; die "unable to write pacman config file $self->{'pacman.conf'} - $!";
my $arch = $config->{architecture};
$arch = 'x86_64' if $arch eq 'amd64';
print $fh <<"EOF"; print $fh <<"EOF";
[options] [options]
HoldPkg = pacman glibc HoldPkg = pacman glibc
Architecture = $config->{architecture} Architecture = $arch
CheckSpace CheckSpace
SigLevel = Never SigLevel = Never