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

More changes needed for the netinst including firmware. Set up build "C" to work the same as build "2" in most respects.

This commit is contained in:
cd-builder user 2010-05-27 13:33:26 +00:00
parent cfd48f468e
commit 370193149e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -193,7 +193,7 @@ $(ADIR)/status:
@echo "Generating a fake status file for apt-get and apt-cache..." @echo "Generating a fake status file for apt-get and apt-cache..."
$(Q)for ARCH in $(ARCHES); do \ $(Q)for ARCH in $(ARCHES); do \
mkdir -p $(ADIR)/$(CODENAME)-$$ARCH/apt/preferences.d; \ mkdir -p $(ADIR)/$(CODENAME)-$$ARCH/apt/preferences.d; \
if [ $$ARCH = "source" -o "$(INSTALLER_CD)" = "1" -o "$(INSTALLER_CD)" = "2" ];then \ if [ $$ARCH = "source" -o "$(INSTALLER_CD)" = "1" -o "$(INSTALLER_CD)" = "2" -o "$(INSTALLER_CD)" = "C" ];then \
:> $(ADIR)/$(CODENAME)-$$ARCH/status ; \ :> $(ADIR)/$(CODENAME)-$$ARCH/status ; \
else \ else \
zcat $(MIRROR)/dists/$(CODENAME)/main/binary-$$ARCH/Packages.gz | \ zcat $(MIRROR)/dists/$(CODENAME)/main/binary-$$ARCH/Packages.gz | \
@ -281,7 +281,7 @@ $(BDIR)/rawlist:
$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \ $(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
if [ "$(INSTALLER_CD)"x = "1"x ] ; then \ if [ "$(INSTALLER_CD)"x = "1"x ] ; then \
: ; \ : ; \
elif [ "$(INSTALLER_CD)"x = "2"x ] ; then \ elif [ "$(INSTALLER_CD)"x = "2"x -o "$(INSTALLER_CD)"x = "C"x ] ; then \
echo -e "mawk" >>$(BDIR)/rawlist; \ echo -e "mawk" >>$(BDIR)/rawlist; \
else \ else \
echo -e "mawk\nexim4-daemon-light" >>$(BDIR)/rawlist; \ echo -e "mawk\nexim4-daemon-light" >>$(BDIR)/rawlist; \

2
build.sh
View File

@ -29,7 +29,7 @@ if [ "$TASK"x = ""x ] ; then
TASK=debian-installer TASK=debian-installer
unset COMPLETE unset COMPLETE
;; ;;
"2"x) "2"x|"C"x)
TASK=debian-installer+kernel TASK=debian-installer+kernel
unset COMPLETE unset COMPLETE
;; ;;

2
build_all.sh
View File

@ -22,7 +22,7 @@ if [ "$TASK"x = ""x ] ; then
TASK=debian-installer TASK=debian-installer
unset COMPLETE unset COMPLETE
;; ;;
"2"x) "2"x|"C"x)
TASK=debian-installer+kernel TASK=debian-installer+kernel
unset COMPLETE unset COMPLETE
;; ;;

2
tools/boot/squeeze/boot-x86
View File

@ -70,7 +70,7 @@ fi
BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz" BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
# Only include disk images on full CDs, not on smaller images. # Only include disk images on full CDs, not on smaller images.
#if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then #if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ] && [ "$INSTALLER_CD" != C ]; then
#DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img" #DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
#EXTRA_DISK_IMAGES="cdrom/boot.img" #EXTRA_DISK_IMAGES="cdrom/boot.img"
#fi #fi

4
tools/start_new_disc
View File

@ -157,7 +157,7 @@ if [ $DISKNUM = 1 ] ; then
case "$INSTALLER_CD"x in case "$INSTALLER_CD"x in
"1"x) "1"x)
UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_include;; UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_include;;
"2"x) "2"x|"C"x)
UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_netinst_udeb_include;; UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_netinst_udeb_include;;
*) *)
UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_udeb_include;; UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_udeb_include;;
@ -168,7 +168,7 @@ if [ $DISKNUM = 1 ] ; then
case "$INSTALLER_CD"x in case "$INSTALLER_CD"x in
"1"x) "1"x)
UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_exclude;; UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_exclude;;
"2"x) "2"x|"C"x)
UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_netinst_udeb_exclude;; UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_netinst_udeb_exclude;;
*) *)
UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_udeb_exclude;; UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_udeb_exclude;;