Commit 2536051e85bafcfa3c39c89ea6d1ead64bff9caa - live-build

+14

-7

functions/defaults.sh less more

118	118	case "${LB_MODE}" in
119	119	progress-linux)
120	120	LB_DISTRIBUTION="${LB_DISTRIBUTION:-cairon}"
	121	LB_DISTRIBUTION="${LB_DISTRIBUTION:-cairon}"
121	122	LB_DERIVATIVE="true"
122	123	LB_DERIVATIVE_IS_BASED_ON="debian"
123	124	;;

127	128	LB_DERIVATIVE="false"
128	129	;;
129	130	esac
	131	LB_DISTRIBUTION_CHROOT="${LB_DISTRIBUTION_CHROOT:-${LB_DISTRIBUTION}}"
	132	LB_DISTRIBUTION_BINARY="${LB_DISTRIBUTION_BINARY:-${LB_DISTRIBUTION_CHROOT}}"
	133
130	134
131	135	case "${LB_MODE}" in
132	136	progress-linux)
133	137	case "${LB_DISTRIBUTION}" in
134	138	baureo\|baureo-backports)
135	139	LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}"
136		LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
137	140	;;
138	141
139	142	cairon\|cairon-backports)
140	143	LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}"
141		LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
142	144	;;
143	145	esac
144	146

146	148	;;
147	149
148	150	*)
149		LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-${LB_DISTRIBUTION}}"
150		LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
151
152	151	LB_BACKPORTS="${LB_BACKPORTS:-false}"
153	152	;;
154	153	esac
	154	if [ -n "$LB_PARENT_DISTRIBUTION" ]; then
	155	LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT:-${LB_PARENT_DISTRIBUTION}}"
	156	LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY:-${LB_PARENT_DISTRIBUTION}}"
	157	else
	158	LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT:-${LB_DISTRIBUTION_CHROOT}}"
	159	LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY:-${LB_DISTRIBUTION_BINARY}}"
	160	fi
	161	LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION_CHROOT}}"
155	162
156	163	# Setting package manager
157	164	LB_APT="${LB_APT:-apt}"

478	485	LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
479	486
480	487	# Setting security updates option
481		case "${LB_PARENT_DISTRIBUTION}" in
	488	case "${LB_PARENT_DISTRIBUTION_BINARY}" in
482	489	sid)
483	490	LB_SECURITY="${LB_SECURITY:-false}"
484	491	;;

489	496	esac
490	497
491	498	# Setting updates updates option
492		case "${LB_PARENT_DISTRIBUTION}" in
	499	case "${LB_PARENT_DISTRIBUTION_BINARY}" in
493	500	sid)
494	501	LB_UPDATES="${LB_UPDATES:-false}"
495	502	;;

+1

-1

functions/echo.sh less more

192	192
193	193	Echo_breakage ()
194	194	{
195		case "${LB_PARENT_DISTRIBUTION}" in
	195	case "${LB_PARENT_DISTRIBUTION_BINARY}" in
196	196	sid)
197	197	Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration, a caching proxy or the sid distribution."
198	198	;;

+5

-5

scripts/build/binary_disk less more

48	48	mkdir -p binary/.disk
49	49
50	50	ARCHITECTURE="$(echo ${LB_ARCHITECTURES} \| sed -e 's\| \|/\|g')"
51		DISTRIBUTION="$(echo ${LB_DISTRIBUTION} \| cut -b 1 \| tr '[a-z]' '[A-Z]')"
52		DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} \| cut -b 2-)"
	51	DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} \| cut -b 1 \| tr '[a-z]' '[A-Z]')"
	52	DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION_BINARY} \| cut -b 2-)"
53	53
54	54	if [ -e chroot/etc/os-release ]
55	55	then

110	110	do
111	111	if [ -e "${LOCATION}" ]
112	112	then
113		cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include
	113	cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include
114	114
115	115	continue
116	116	fi

135	135	do
136	136	if [ -e "${LOCATION}" ]
137	137	then
138		cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include
	138	cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include
139	139
140	140	continue
141	141	fi

158	158	do
159	159	if [ -e "${LOCATION}" ]
160	160	then
161		cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include
	161	cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include
162	162
163	163	continue
164	164	fi

+3

-3

scripts/build/binary_package-lists less more

140	140
141	141	SECTION="$(basename ${SECTION})"
142	142
143		mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}
144		apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
145		gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
	143	mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}
	144	apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
	145	gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
146	146	done
147	147
148	148	cd "${OLDPWD}"

+2

-2

scripts/build/binary_syslinux less more

203	203
204	204	_VERSION="${_VERSION:-none}"
205	205
206		_DISTRIBUTION="${LB_DISTRIBUTION}"
	206	_DISTRIBUTION="${LB_DISTRIBUTION_BINARY}"
207	207	_ARCHITECTURE="${LB_ARCHITECTURES}"
208	208
209	209	_DATE=$(date -R)

241	241	-e "s#@APPEND_INSTALL_FAILSAFE@#${LB_BOOTAPPEND_INSTALL_FAILSAFE}#g" \
242	242	-e "s\|@PROJECT@\|${_PROJECT}\|g" \
243	243	-e "s\|@DISTRIBUTION@\|${_DISTRIBUTION}\|g" \
244		-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION}\|g" \
	244	-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION_BINARY}\|g" \
245	245	-e "s\|@VERSION@\|${_VERSION}\|g" \
246	246	-e "s\|@ARCHITECTURE@\|${_ARCHITECTURE}\|g" \
247	247	-e "s\|@DATE@\|${_DATE}\|g" \

+13

-13

scripts/build/bootstrap_archives less more

64	64	fi
65	65
66	66	cat > chroot/etc/apt/${_PARENT_FILE} << EOF
67		deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
	67	deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}
68	68	EOF
69	69
70	70	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
71	71	then
72		echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	72	echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
73	73	fi
74	74
75	75	if [ "${LB_DERIVATIVE}" = "true" ]
76	76	then
77	77	rm -f chroot/etc/apt/sources.list.d/${LB_MODE}.list
78	78
79		_DISTRIBUTION="$(echo ${LB_DISTRIBUTION} \| sed -e 's\|-backports\|\|')"
	79	_DISTRIBUTION="$(echo ${LB_DISTRIBUTION_CHROOT} \| sed -e 's\|-backports\|\|')"
80	80
81	81	echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
82	82

90	90	then
91	91	case "${LB_MODE}" in
92	92	debian\|progress-linux)
93		case "${LB_PARENT_DISTRIBUTION}" in
	93	case "${LB_PARENT_DISTRIBUTION_CHROOT}" in
94	94	sid)
95	95
96	96	;;
97	97
98	98	*)
99		echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	99	echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
100	100
101	101	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
102	102	then
103		echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	103	echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
104	104	fi
105	105	;;
106	106	esac

130	130
131	131	if [ "${LB_UPDATES}" = "true" ]
132	132	then
133		echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	133	echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
134	134
135	135	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
136	136	then
137		echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	137	echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
138	138	fi
139	139
140	140	if [ "${LB_DERIVATIVE}" = "true" ]

152	152	then
153	153	case "${LB_MODE}" in
154	154	debian)
155		if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
	155	if [ "${LB_PARENT_DISTRIBUTION_CHROOT}" != "sid" ]
156	156	then
157		echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	157	echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
158	158
159	159	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
160	160	then
161		echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	161	echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
162	162	fi
163	163	fi
164	164	;;

180	180	do
181	181	if [ -e "${FILE}" ]
182	182	then
183		sed -e "s\|@DISTRIBUTION@\|${LB_DISTRIBUTION}\|g" \
184		-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION}\|g" \
	183	sed -e "s\|@DISTRIBUTION@\|${LB_DISTRIBUTION_CHROOT}\|g" \
	184	-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION_CHROOT}\|g" \
185	185	-e "s\|@ARCHIVE_AREAS@\|${LB_ARCHIVE_AREAS}\|g" \
186	186	-e "s\|@PARENT_ARCHIVE_AREAS@\|${LB_PARENT_ARCHIVE_AREAS}\|g" \
187	187	"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"

+3

-3

scripts/build/bootstrap_debootstrap less more

87	87	fi
88	88
89	89	Echo_breakage "Running debootstrap (download-only)... "
90		debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
	90	debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
91	91
92	92	# Removing old cache
93	93	rm -f cache/packages.bootstrap/*.deb

108	108	fi
109	109
110	110	Echo_message "Bootstrap will be foreign"
111		debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
	111	debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
112	112
113	113	Echo_message "Running debootstrap second stage under QEMU"
114	114	cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin
115	115	Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage ${FOREIGN_DEBOOTSTRAP_OPTIONS}
116	116	else
117		debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
	117	debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
118	118	fi
119	119
120	120	# Deconfiguring debootstrap configurations

+1

-1

scripts/build/build less more

65	65	Check_defaults
66	66
67	67	Echo_message "live-build ${LIVE_BUILD_VERSION}"
68		Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system"
	68	Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
69	69
70	70	# Bootstrapping system
71	71	lb bootstrap ${@}

+2

-2

scripts/build/chroot_apt less more

149	149	progress-linux)
150	150	if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ]
151	151	then
152		_DISTRIBUTION="$(echo ${LB_DISTRIBUTION} \| sed -e 's\|-backports\|\|')"
	152	_DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} \| sed -e 's\|-backports\|\|')"
153	153
154	154	_ENABLE_DISTRIBUTIONS="${_DISTRIBUTION}"
155	155	_DISABLE_DISTRIBUTIONS=""

164	164	_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-updates"
165	165	fi
166	166
167		case "${LB_DISTRIBUTION}" in
	167	case "${LB_DISTRIBUTION_BINARY}" in
168	168	*-backports)
169	169	if [ "${LB_BACKPORTS}" = "true" ]
170	170	then

+28

-28

scripts/build/chroot_archives less more

63	63	fi
64	64
65	65	cat > chroot/etc/apt/${_PARENT_FILE} << EOF
66		deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
	66	deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}
67	67	EOF
68	68
69	69	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
70	70	then
71		echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	71	echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
72	72	fi
73	73
74	74	if [ "${LB_DERIVATIVE}" = "true" ]
75	75	then
76	76	rm -f chroot/etc/apt/sources.list.d/${LB_MODE}.list
77	77
78		_DISTRIBUTION="$(echo ${LB_DISTRIBUTION} \| sed -e 's\|-backports\|\|')"
	78	_DISTRIBUTION="$(echo ${LB_DISTRIBUTION_CHROOT} \| sed -e 's\|-backports\|\|')"
79	79
80	80	echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
81	81

89	89	then
90	90	case "${LB_MODE}" in
91	91	debian\|progress-linux)
92		case "${LB_PARENT_DISTRIBUTION}" in
	92	case "${LB_PARENT_DISTRIBUTION_CHROOT}" in
93	93	sid)
94	94
95	95	;;
96	96
97	97	*)
98		echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	98	echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
99	99
100	100	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
101	101	then
102		echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	102	echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION_CHROOT}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
103	103	fi
104	104	;;
105	105	esac

129	129
130	130	if [ "${LB_UPDATES}" = "true" ]
131	131	then
132		echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	132	echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
133	133
134	134	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
135	135	then
136		echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	136	echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
137	137	fi
138	138
139	139	if [ "${LB_DERIVATIVE}" = "true" ]

151	151	then
152	152	case "${LB_MODE}" in
153	153	debian)
154		if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
155		then
156		echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	154	if [ "${LB_PARENT_DISTRIBUTION_CHROOT}" != "sid" ]
	155	then
	156	echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
157	157
158	158	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
159	159	then
160		echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	160	echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
161	161	fi
162	162	fi
163	163	;;

179	179	do
180	180	if [ -e "${FILE}" ]
181	181	then
182		sed -e "s\|@DISTRIBUTION@\|${LB_DISTRIBUTION}\|g" \
183		-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION}\|g" \
	182	sed -e "s\|@DISTRIBUTION@\|${LB_DISTRIBUTION_CHROOT}\|g" \
	183	-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION_CHROOT}\|g" \
184	184	-e "s\|@ARCHIVE_AREAS@\|${LB_ARCHIVE_AREAS}\|g" \
185	185	-e "s\|@PARENT_ARCHIVE_AREAS@\|${LB_PARENT_ARCHIVE_AREAS}\|g" \
186	186	"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"

462	462	# Configure custom sources.list
463	463
464	464	cat > chroot/etc/apt/${_PARENT_FILE} << EOF
465		deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
	465	deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY} ${LB_PARENT_ARCHIVE_AREAS}
466	466	EOF
467	467
468	468	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
469	469	then
470		echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	470	echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
471	471	fi
472	472
473	473	if [ "${LB_DERIVATIVE}" = "true" ]
474	474	then
475	475	rm -f chroot/etc/apt/sources.list.d/${LB_MODE}.list
476	476
477		_DISTRIBUTION="$(echo ${LB_DISTRIBUTION} \| sed -e 's\|-backports\|\|')"
	477	_DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} \| sed -e 's\|-backports\|\|')"
478	478
479	479	echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
480	480

488	488	then
489	489	case "${LB_MODE}" in
490	490	debian\|progress-linux)
491		case "${LB_PARENT_DISTRIBUTION}" in
	491	case "${LB_PARENT_DISTRIBUTION_BINARY}" in
492	492	sid)
493	493
494	494	;;
495	495
496	496	*)
497		echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	497	echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION_BINARY}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
498	498
499	499	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
500	500	then
501		echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	501	echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION_BINARY}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
502	502	fi
503	503	;;
504	504	esac

528	528
529	529	if [ "${LB_UPDATES}" = "true" ]
530	530	then
531		echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	531	echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
532	532
533	533	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
534	534	then
535		echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	535	echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
536	536	fi
537	537
538	538	if [ "${LB_DERIVATIVE}" = "true" ]

550	550	then
551	551	case "${LB_MODE}" in
552	552	debian)
553		if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
554		then
555		echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	553	if [ "${LB_PARENT_DISTRIBUTION_BINARY}" != "sid" ]
	554	then
	555	echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
556	556
557	557	if [ "${_PASS}" = "source" ] \|\| [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
558	558	then
559		echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
	559	echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION_BINARY}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
560	560	fi
561	561	fi
562	562	;;

605	605	do
606	606	if [ -e "${FILE}" ]
607	607	then
608		sed -e "s\|@DISTRIBUTION@\|${LB_DISTRIBUTION}\|g" \
609		-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION}\|g" \
	608	sed -e "s\|@DISTRIBUTION@\|${LB_DISTRIBUTION_BINARY}\|g" \
	609	-e "s\|@PARENT_DISTRIBUTION@\|${LB_PARENT_DISTRIBUTION_BINARY}\|g" \
610	610	-e "s\|@ARCHIVE_AREAS@\|${LB_ARCHIVE_AREAS}\|g" \
611	611	-e "s\|@PARENT_ARCHIVE_AREAS@\|${LB_PARENT_ARCHIVE_AREAS}\|g" \
612	612	"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)"

+8

-8

scripts/build/chroot_firmware less more

58	58
59	59	FIRMWARE_PACKAGES=""
60	60
61		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
	61	_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION_CHROOT}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
62	62
63		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
	63	rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
64	64
65	65	for _CONTENT in ${_CONTENTS}
66	66	do
67		wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
	67	wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
68	68
69		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} \| sort -u)"
	69	FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} \| sort -u)"
70	70	done
71	71
72	72	if echo ${LB_PARENT_ARCHIVE_AREAS} \| grep -qs "non-free"

90	90	then
91	91	# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
92	92
93		_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
	93	_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION_CHROOT}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
94	94
95		rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
	95	rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
96	96
97	97	for _CONTENT in ${_CONTENTS}
98	98	do
99		wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
	99	wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
100	100
101		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} \| sort -u)"
	101	FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} \| sort -u)"
102	102	done
103	103	fi
104	104

+50

-5

scripts/build/config less more

56	56	\t [-d\|--distribution CODENAME]\n\
57	57	\t [--parent-distribution CODENAME]\n\
58	58	\t [--parent-debian-installer-distribution CODENAME]\n\
	59	\t [--distribution-chroot CODENAME]\n\
	60	\t [--parent-distribution-chroot CODENAME]\n\
	61	\t [--distribution-binary CODENAME]\n\
	62	\t [--parent-distribution-binary CODENAME]\n\
59	63	\t [--dump]\n\
60	64	\t [--fdisk fdisk\|fdisk.dist]\n\
61	65	\t [--force]\n\

132	136	cache-stages:,debconf-frontend:,debconf-priority:,dump,
133	137	initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:,
134	138	architectures:,clean,
135		distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-binary:,
	139	distribution:,parent-distribution:,parent-debian-installer-distribution:,
	140	distribution-chroot:,parent-distribution-chroot:,
	141	distribution-binary:,parent-distribution-binary:,
	142	parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-binary:,
136	143	parent-mirror-binary-security:,parent-mirror-debian-installer:,
137	144	mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
138	145	mirror-binary-security:,mirror-debian-installer:,

351	358	shift 2
352	359	;;
353	360
	361	--distribution-chroot)
	362	LB_DISTRIBUTION_CHROOT="${2}"
	363	shift 2
	364	;;
	365
	366	--parent-distribution-chroot)
	367	LB_PARENT_DISTRIBUTION_CHROOT="${2}"
	368	shift 2
	369	;;
	370
	371	--distribution-binary)
	372	LB_DISTRIBUTION_BINARY="${2}"
	373	shift 2
	374	;;
	375
	376	--parent-distribution-binary)
	377	LB_PARENT_DISTRIBUTION_BINARY="${2}"
	378	shift 2
	379	;;
	380
354	381	-m\|--parent-mirror-bootstrap)
355	382	LB_PARENT_MIRROR_BOOTSTRAP="${2}"
356	383	shift 2

878	905
879	906	if [ ! -e config ]
880	907	then
881		Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system"
	908	Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
882	909	mkdir config
883	910	else
884		Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system"
	911	Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
885	912	fi
886	913
887	914	# Creating live-build configuration

1018	1045	# \$LB_PARENT_DISTRIBUTION: select parent distribution to use
1019	1046	# (Default: ${LB_PARENT_DISTRIBUTION})
1020	1047	LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
	1048
	1049	# \$LB_DISTRIBUTION_CHROOT: select distribution to use in the chroot
	1050	# (Default: ${LB_DISTRIBUTION_CHROOT})
	1051	LB_DISTRIBUTION_CHROOT="${LB_DISTRIBUTION_CHROOT}"
	1052
	1053	# \$LB_PARENT_DISTRIBUTION_CHROOT: select parent distribution to use in the chroot
	1054	# (Default: ${LB_PARENT_DISTRIBUTION_CHROOT})
	1055	LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT}"
	1056
	1057	# \$LB_DISTRIBUTION_BINARY: select distribution to use in the final image
	1058	# (Default: ${LB_DISTRIBUTION_BINARY})
	1059	LB_DISTRIBUTION_BINARY="${LB_DISTRIBUTION_BINARY}"
	1060
	1061	# \$LB_PARENT_DISTRIBUTION_BINARY: select parent distribution to use in the final image
	1062	# (Default: ${LB_PARENT_DISTRIBUTION_BINARY})
	1063	LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY}"
1021	1064
1022	1065	# \$LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
1023	1066	# (Default: ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION})

1385	1428	[Image]
1386	1429	Architecture: ${LB_ARCHITECTURES}
1387	1430	Archive-Areas: ${LB_ARCHIVE_AREAS}
1388		Distribution: ${LB_DISTRIBUTION}
	1431	Distribution-Chroot: ${LB_DISTRIBUTION_CHROOT}
	1432	Distribution-Binary: ${LB_DISTRIBUTION_BINARY}
1389	1433	Mirror-Bootstrap: ${LB_MIRROR_BOOTSTRAP}
1390	1434	EOF
1391	1435

1395	1439	cat >> config/build << EOF
1396	1440
1397	1441	Parent-Archive-Areas: ${LB_ARCHIVE_AREAS}
1398		Parent-Distribution: ${LB_PARENT_DISTRIBUTION}
	1442	Parent-Distribution-Chroot: ${LB_PARENT_DISTRIBUTION_CHROOT}
	1443	Parent-Distribution-Binary: ${LB_PARENT_DISTRIBUTION_BINARY}
1399	1444	Parent-Mirror-Bootstrap: ${LB_PARENT_MIRROR_BOOTSTRAP}
1400	1445	EOF
1401	1446

+20

-28

scripts/build/installer_debian-installer less more

348	348
349	349	FIRMWARE_PACKAGES=""
350	350
351		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
352
353		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
	351	_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION_CHROOT}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
	352
	353	rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
354	354
355	355	for _CONTENT in ${_CONTENTS}
356	356	do
357		wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
358
359		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} \| sort -u)"
	357	wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
	358
	359	FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} \| sort -u)"
360	360	done
361	361
362	362	if echo ${LB_PARENT_ARCHIVE_AREAS} \| grep -qs "non-free"

380	380	then
381	381	# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
382	382
383		_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
384
385		rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
	383	_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION_CHROOT}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
	384
	385	rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
386	386
387	387	for _CONTENT in ${_CONTENTS}
388	388	do
389		wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
390
391		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} \| sort -u)"
	389	wget ${WGET_OPTIONS} ${_CONTENT} -O - \| gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES}
	390
	391	FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION_CHROOT}.${LB_ARCHITECTURES} \| sort -u)"
392	392	done
393	393	fi
394	394

671	671	_LB_APT_VERSION_OPT='-o APT::FTPArchive::Release::Version="'"${_VERSION}"'"'
672	672	fi
673	673
674		case "${LB_PARENT_DISTRIBUTION}" in
	674	case "${LB_PARENT_DISTRIBUTION_BINARY}" in
675	675	sid)
676	676	_SUITE="unstable"
677	677	;;
678	678
679	679	*)
680		_SUITE="${LB_PARENT_DISTRIBUTION}"
	680	_SUITE="${LB_PARENT_DISTRIBUTION_BINARY}"
681	681	;;
682	682	esac
683	683

687	687	-o APT::FTPArchive::Release::Label="Debian" \
688	688	-o APT::FTPArchive::Release::Suite="${_SUITE}" \
689	689	${_LB_APT_VERSION_OPT} \
690		-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \
	690	-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION_BINARY}" \
691	691	-o APT::FTPArchive::Release::Date="$(date -R)" \
692	692	-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
693	693	-o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \

699	699	rm -f chroot/binary.sh
700	700	mv chroot/root/binary ./
701	701
702		case "${LB_PARENT_DISTRIBUTION}" in
703		jessie)
704		DISTRIBUTIONS="stable"
705		;;
706
707		*)
708		DISTRIBUTIONS="stable testing unstable"
709		;;
710		esac
711
712		if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ]
713		then
714		DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}"
	702	DISTRIBUTIONS="stable testing unstable"
	703
	704	if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION_BINARY}" ]
	705	then
	706	DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION_BINARY}"
715	707	fi
716	708
717	709	case "${LIVE_IMAGE_TYPE}" in

+3

-3

scripts/build/source_debian less more

116	116	# where available. workaround: disable backports
117	117	case "${LB_MODE}" in
118	118	progress-linux)
119		case "${LB_DISTRIBUTION}" in
	119	case "${LB_DISTRIBUTION_BINARY}" in
120	120	*-backports)
121	121
122	122	;;
123	123
124	124	*)
125		if grep -qs "${LB_DISTRIBUTION}-backports" chroot/etc/apt/sources.list.d/progress-linux.list
	125	if grep -qs "${LB_DISTRIBUTION_BINARY}-backports" chroot/etc/apt/sources.list.d/progress-linux.list
126	126	then
127	127	cp chroot/etc/apt/sources.list.d/progress-linux.list chroot/etc/apt/sources.list.d/progress-linux.list.orig
128	128
129	129	while read _LINE
130	130	do
131		if echo "${_LINE}" \| grep -qs ${LB_DISTRIBUTION}-backports
	131	if echo "${_LINE}" \| grep -qs ${LB_DISTRIBUTION_BINARY}-backports
132	132	then
133	133	sed -i -e "s\|${_LINE}\|#${_LINE}\|" chroot/etc/apt/sources.list.d/progress-linux.list
134	134	fi

+2

-2

scripts/build/source_disk less more

48	48
49	49	mkdir -p source/.disk
50	50
51		DISTRIBUTION="$(echo ${LB_DISTRIBUTION} \| cut -b 1 \| tr '[a-z]' '[A-Z]')"
52		DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} \| cut -b 2-)"
	51	DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} \| cut -b 1 \| tr '[a-z]' '[A-Z]')"
	52	DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION_BINARY} \| cut -b 2-)"
53	53
54	54	if [ -e chroot/etc/os-release ]
55	55	then