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

Update Makefile to set MKISOFS to xorriso by default when building 

images for i386/amd64. Otherwise a build that doesn't set MKISOFS
and MKISOFS_OPTS fails.
This commit is contained in:
Raphaël Hertzog 2013-03-01 08:00:03 +00:00
parent bd8597feaa
commit b77a268aa2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -21,8 +21,13 @@ ifndef TASK
TASK=Debian-generic TASK=Debian-generic
endif endif
ifndef MKISOFS ifndef MKISOFS
ifneq (,$(filter i386 amd64,$(ARCHES)))
export MKISOFS=xorriso
export MKISOFS_OPTS=-as mkisofs -r -checksum_algorithm_iso md5,sha1
else
export MKISOFS=$(shell which genisoimage mkisofs | head -1) export MKISOFS=$(shell which genisoimage mkisofs | head -1)
endif endif
endif
ifndef MKISOFS_OPTS ifndef MKISOFS_OPTS
#For normal users #For normal users
MKISOFS_OPTS=-r MKISOFS_OPTS=-r

5
debian/changelog vendored
View File

@ -25,6 +25,11 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
bootable x86 media. Thanks to Daniel Baumann for the path. bootable x86 media. Thanks to Daniel Baumann for the path.
Closes: #699884 Closes: #699884
[ Raphaël Hertzog ]
* Update Makefile to set MKISOFS to xorriso by default when building
images for i386/amd64. Otherwise a build that doesn't set MKISOFS
and MKISOFS_OPTS fails.
-- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100 -- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100
debian-cd (3.1.11) unstable; urgency=low debian-cd (3.1.11) unstable; urgency=low