Project

General

Profile

« Previous | Next » 

Revision efd95df7

Added by Renato Botelho about 9 years ago

Use synlink path for core repo and fix resume build

View differences:

tools/builder_common.sh
85 85
	# Use the same directory structure as poudriere does to avoid
86 86
	# breaking snapshot repositories during rsync
87 87
	ln -sf $(basename ${CORE_PKG_REAL_PATH}) ${CORE_PKG_PATH}/.latest
88
	ln -sf .latest/All ${CORE_PKG_PATH}/All
88
	ln -sf .latest/All ${CORE_PKG_ALL_PATH}
89 89
	ln -sf .latest/digests.txz ${CORE_PKG_PATH}/digests.txz
90 90
	ln -sf .latest/meta.txz ${CORE_PKG_PATH}/meta.txz
91 91
	ln -sf .latest/packagesite.txz ${CORE_PKG_PATH}/packagesite.txz
......
303 303
			print_error_pfS
304 304
		fi
305 305

  
306
		if [ -n "${NO_BUILDKERNEL}" -a -f "${CORE_PKG_REAL_PATH}/All/$(get_pkg_name kernel-${KERNEL_NAME}).txz" ]; then
306
		if [ -n "${NO_BUILDKERNEL}" -a -f "${CORE_PKG_ALL_PATH}/$(get_pkg_name kernel-${KERNEL_NAME}).txz" ]; then
307 307
			echo ">>> NO_BUILDKERNEL set, skipping build" | tee -a ${LOGFILE}
308 308
			continue
309 309
		fi
......
355 355
	fi
356 356
	mkdir -p $FINAL_CHROOT_DIR/pkgs
357 357
	if [ -z "${2}" -o -n "${INSTALL_EXTRA_KERNELS}" ]; then
358
		cp ${CORE_PKG_REAL_PATH}/All/$(get_pkg_name kernel-${KERNEL_NAME}).txz $FINAL_CHROOT_DIR/pkgs
358
		cp ${CORE_PKG_ALL_PATH}/$(get_pkg_name kernel-${KERNEL_NAME}).txz $FINAL_CHROOT_DIR/pkgs
359 359
		if [ -n "${INSTALL_EXTRA_KERNELS}" ]; then
360 360
			for _EXTRA_KERNEL in $INSTALL_EXTRA_KERNELS; do
361
				_EXTRA_KERNEL_PATH=${CORE_PKG_REAL_PATH}/All/$(get_pkg_name kernel-${_EXTRA_KERNEL}).txz
361
				_EXTRA_KERNEL_PATH=${CORE_PKG_ALL_PATH}/$(get_pkg_name kernel-${_EXTRA_KERNEL}).txz
362 362
				if [ -f "${_EXTRA_KERNEL_PATH}" ]; then
363 363
					echo -n ". adding ${_EXTRA_KERNEL_PATH} on image /pkgs folder"
364 364
					cp ${_EXTRA_KERNEL_PATH} $FINAL_CHROOT_DIR/pkgs
......
1323 1323
	     "${_image_type}" = "memstickadi" ]; then
1324 1324
		install_bsdinstaller
1325 1325
		mkdir -p ${FINAL_CHROOT_DIR}/pkgs
1326
		cp ${CORE_PKG_REAL_PATH}/All/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs
1326
		cp ${CORE_PKG_ALL_PATH}/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs
1327 1327
	fi
1328 1328

  
1329 1329
	pkg_chroot_add ${FINAL_CHROOT_DIR} ${_default_config}
......
1735 1735
		print_error_pfS
1736 1736
	fi
1737 1737

  
1738
	if [ ! -f ${CORE_PKG_REAL_PATH}/All/${_pkg} ]; then
1738
	if [ ! -f ${CORE_PKG_ALL_PATH}/${_pkg} ]; then
1739 1739
		echo ">>> ERROR: Package ${_pkg} not found"
1740 1740
		print_error_pfS
1741 1741
	fi
1742 1742

  
1743
	cp ${CORE_PKG_REAL_PATH}/All/${_pkg} ${_target}
1743
	cp ${CORE_PKG_ALL_PATH}/${_pkg} ${_target}
1744 1744
	pkg_chroot ${_target} add /${_pkg}
1745 1745
	rm -f ${_target}/${_pkg}
1746 1746
}
tools/builder_defaults.sh
344 344
export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}${PRODUCT_REVISION:+_}${PRODUCT_REVISION}"
345 345
export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"}
346 346
export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}"
347
export CORE_PKG_ALL_PATH="${CORE_PKG_PATH}/All"
347 348
export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"}
348 349

  
349 350
export PKG_REPO_BASE=${PKG_REPO_BASE:-"${FREEBSD_SRC_DIR}/release/pkg_repos"}

Also available in: Unified diff