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

CONF.sh: don't determine ARCHES if already set; don't export CPU and KERNEL

This commit is contained in:
Frans Pop 2006-12-18 15:22:35 +00:00
parent 9227f45460
commit 7741fc3c83
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CONF.sh
View File

@ -53,7 +53,7 @@ export BASEDIR=`pwd`
export CODENAME=etch
# By default use Debian installer packages from $CODENAME
if [ ! "$DI_CODENAME" ]; then
if [ -z "$DI_CODENAME" ]; then
export DI_CODENAME=$CODENAME
fi
@ -74,20 +74,22 @@ export OFFICIAL="Unofficial"
#export OFFICIAL="Official Beta"
# ... for arch
CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
if [ "$CPU"x = ""x ] ; then
if [ -z "$ARCHES" ]; then
CPU=`dpkg-architecture -qDEB_HOST_DPKG_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`
if [ "$KERNEL"x = ""x ] ; then
fi
KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
if [ -z "$KERNEL" ]; then
KERNEL=linux
fi
if [ $KERNEL = linux ] ; then
fi
if [ $KERNEL = linux ] ; then
ARCHES=$CPU
else
else
ARCHES="$KERNEL-$CPU"
fi
export ARCHES
fi
export CPU KERNEL ARCHES
# IMPORTANT : The 4 following paths must be on the same partition/device.
# If they aren't then you must set COPYLINK below to 1. This

22
debian/CONF.sh vendored
View File

@ -53,7 +53,7 @@ export BASEDIR=`pwd`
export CODENAME=etch
# By default use Debian installer packages from $CODENAME
if [ ! "$DI_CODENAME" ]; then
if [ -z "$DI_CODENAME" ]; then
export DI_CODENAME=$CODENAME
fi
@ -74,20 +74,22 @@ export OFFICIAL="Unofficial"
#export OFFICIAL="Official Beta"
# ... for arch
CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
if [ "$CPU"x = ""x ] ; then
if [ -z "$ARCHES" ]; then
CPU=`dpkg-architecture -qDEB_HOST_DPKG_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`
if [ "$KERNEL"x = ""x ] ; then
fi
KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
if [ -z "$KERNEL" ]; then
KERNEL=linux
fi
if [ $KERNEL = linux ] ; then
fi
if [ $KERNEL = linux ] ; then
ARCHES=$CPU
else
else
ARCHES="$KERNEL-$CPU"
fi
export ARCHES
fi
export CPU KERNEL ARCHES
# IMPORTANT : The 4 following paths must be on the same partition/device.
# If they aren't then you must set COPYLINK below to 1. This

8
debian/changelog vendored
View File

@ -165,12 +165,14 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
* Don't put ppc boot files on discs >1.
* Add more hfs options to m68k discs, to match ppc.
* Make list2cds more verbose in log output, especially when
dependencies have failed so a package can't be added
dependencies have failed so a package can't be added.
[ Frans Pop ]
* CONF.sh: case can handle empty variables fine; whitespace cleanup
* CONF.sh: case can handle empty variables fine; whitespace cleanup.
* CONF.sh: don't determine ARCHES if already set; don't export CPU and
KERNEL.
-- Frans Pop <fjp@debian.org> Mon, 18 Dec 2006 16:14:02 +0100
-- Frans Pop <fjp@debian.org> Mon, 18 Dec 2006 16:20:22 +0100
debian-cd (2.2.25) unstable; urgency=low