Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct usage of dpkg-architecture to fix errors. Closes: 703487

This commit is contained in:
Steve McIntyre 2013-03-20 13:32:16 +00:00
parent b7ea5d5530
commit 2ab852fe07
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONF.sh
View File

@ -85,11 +85,11 @@ export OFFICIAL="Unofficial"
# ... for arch
if [ -z "$ARCHES" ]; then
CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
CPU=`dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || true`
if [ -z "$CPU" ]; then
CPU=`dpkg-architecture -qDEB_HOST_ARCH`
fi
KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
KERNEL=`dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || true`
if [ -z "$KERNEL" ]; then
KERNEL=linux
fi

1
debian/changelog vendored
View File

@ -53,6 +53,7 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
* Extract debian-archive-keyring when setting up apt to avoid error
messages about missing keys. Closes: #703431
* Fix cpp warning in Makefile. Closes: #704342
* Correct usage of dpkg-architecture to fix errors. Closes: 703487
-- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100