Package: debian-cd
Version: 2.2.23
Severity: normal
Tags: patch
Hi,
The attached patch fixes a pair of issues when using debian-cd to generate
Debian GNU/kFreeBSD CDs.
Aside from a few other changes, that are related with the fact that we use
unofficial servers as source (which I'm not sending), this should be enough to
generate the CD set once the port is in the official archive.
Thanks!
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-1-k7
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL
set to C)
Versions of packages debian-cd depends on:
ii apt 0.6.41 Advanced front-end for dpkg
ii apt-utils 0.6.41 APT utility programs
ii bc 1.06-17 The GNU bc arbitrary precision cal
ii cpp 4:4.0.1-3 The GNU C preprocessor (cpp)
ii debootstrap 0.3.1.5 Bootstrap a basic Debian system
ii grep-dctrl 2.6.7 Grep Debian package information
ii lynx 2.8.5-2 Text-mode WWW Browser
ii make 3.80-11 The GNU version of the "make" util
ii mkisofs 4:2.01+01a01-4 Creates ISO-9660 CD-ROM filesystem
ii perl [libdigest-md5-perl] 5.8.7-4 Larry Wall's Practical Extraction
ii sysutils 1.3.8.5.1 Miscellaneous small system utiliti
Versions of packages debian-cd recommends:
ii debianutils 2.14.3 Miscellaneous utilities specific t
pn hfsutils <none> (no description available)
pn jigdo-file <none> (no description available)
-- no debconf information
diff -ur debian-cd.old/CONF.sh debian-cd/CONF.sh
--- debian-cd.old/CONF.sh 2005-08-23 01:12:12.000000000 +0200
+++ debian-cd/CONF.sh 2005-09-10 13:30:04.000000000 +0200
@@ -74,7 +74,10 @@
#export OFFICIAL="Official Beta"
# ... for arch
-export ARCH=`dpkg --print-architecture`
+export CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU`
+export KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS`
+export KERNEL_NAME=`uname -s | sed -e "s,GNU/,,g" -e "s,GNU,Hurd,g"`
+export ARCH=${KERNEL}-${CPU}
# 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
@@ -147,8 +150,10 @@
# export MKISOFS_OPTS="-r" #For normal users
# export MKISOFS_OPTS="-r -F ." #For symlink farmers
+if [ "$KERNEL" = "linux" ] ; then
# ISOLinux support for multiboot on CD1 for i386
export ISOLINUX=1
+fi
# uncomment this to if you want to see more of what the Makefile is doing
#export VERBOSE_MAKE=1
diff -ur debian-cd.old/Makefile debian-cd/Makefile
--- debian-cd.old/Makefile 2005-08-23 01:12:12.000000000 +0200
+++ debian-cd/Makefile 2005-09-10 13:27:54.000000000 +0200
@@ -23,24 +23,30 @@
ifndef CAPCODENAME
CAPCODENAME:=$(shell perl -e "print ucfirst("$(CODENAME)")")
endif
+ifndef KERNEL_NAME
+KERNEL_NAME=Linux
+endif
ifndef BINDISKINFO
-export BINDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" -
$(OFFICIAL) $(ARCH) Binary-$$num ($$DATE)"
+export BINDISKINFO="Debian GNU/$(KERNEL_NAME) $(DEBVERSION) \"$(CAPCODENAME)\"
- $(OFFICIAL) $(ARCH) Binary-$$num ($$DATE)"
endif
ifndef SRCDISKINFO
-export SRCDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" -
$(OFFICIAL) Source-$$num ($$DATE)"
+export SRCDISKINFO="Debian GNU/$(KERNEL_NAME) $(DEBVERSION) \"$(CAPCODENAME)\"
- $(OFFICIAL) Source-$$num ($$DATE)"
endif
# ND=No-Date versions for README
ifndef BINDISKINFOND
-export BINDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" -
$(OFFICIAL) $(ARCH) Binary-$$num"
+export BINDISKINFOND="Debian GNU/$(KERNEL_NAME) $(DEBVERSION)
\"$(CAPCODENAME)\" - $(OFFICIAL) $(ARCH) Binary-$$num"
endif
ifndef SRCDISKINFOND
-export SRCDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" -
$(OFFICIAL) Source-$$num"
+export SRCDISKINFOND="Debian GNU/$(KERNEL_NAME) $(DEBVERSION)
\"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num"
endif
ifndef BINVOLID
-ifeq ($(ARCH),powerpc)
+ifndef CPU
+CPU=$(ARCH)
+endif
+ifeq ($(CPU),powerpc)
BINVOLID="Debian $(DEBVERSION) ppc Bin-$$num"
else
-BINVOLID="Debian $(DEBVERSION) $(ARCH) Bin-$$num"
+BINVOLID="Debian $(DEBVERSION) $(CPU) Bin-$$num"
endif
endif
ifndef SRCVOLID
