Project

General

Profile

« Previous | Next » 

Revision 651f440c

Added by Renato Botelho almost 10 years ago

Replace hardcoded paths by PRODUCT_SHARE_DIR

View differences:

tools/builder_common.sh
354 354
	rm ${FINAL_CHROOT_DIR}/boot/loader.conf.local 2>/dev/null
355 355

  
356 356
	# Old systems will run (pre|post)_upgrade_command from /tmp
357
	if [ -f ${FINAL_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/pre_upgrade_command ]; then
357
	if [ -f ${FINAL_CHROOT_DIR}${PRODUCT_SHARE_DIR}/pre_upgrade_command ]; then
358 358
		cp -p \
359
			${FINAL_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/pre_upgrade_command \
359
			${FINAL_CHROOT_DIR}${PRODUCT_SHARE_DIR}/pre_upgrade_command \
360 360
			${FINAL_CHROOT_DIR}/tmp
361 361
	fi
362
	if [ -f ${FINAL_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/post_upgrade_command ]; then
362
	if [ -f ${FINAL_CHROOT_DIR}${PRODUCT_SHARE_DIR}/post_upgrade_command ]; then
363 363
		cp -p \
364
			${FINAL_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/post_upgrade_command \
364
			${FINAL_CHROOT_DIR}${PRODUCT_SHARE_DIR}/post_upgrade_command \
365 365
			${FINAL_CHROOT_DIR}/tmp
366 366
	fi
367 367

  
......
1047 1047
		${BUILDER_TOOLS}/templates/core_pkg/base/exclude_files \
1048 1048
		> ${_exclude_files}
1049 1049

  
1050
	mkdir -p ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME} >/dev/null 2>&1
1050
	mkdir -p ${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR} >/dev/null 2>&1
1051 1051

  
1052 1052
	# Include a sample pkg stable conf to base
1053 1053
	setup_pkg_repo \
1054
		${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo.conf
1054
		${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR}/${PRODUCT_NAME}-repo.conf \
1055 1055
		${TARGET} \
1056 1056
		${TARGET_ARCH} \
1057 1057
		${PKG_REPO_CONF_BRANCH} \
......
1059 1059

  
1060 1060
	# Include a sample pkg devel conf to base
1061 1061
	setup_pkg_repo \
1062
		${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo-devel.conf
1062
		${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR}/${PRODUCT_NAME}-repo-devel.conf \
1063 1063
		${TARGET} \
1064 1064
		${TARGET_ARCH} \
1065 1065
		${PKG_REPO_CONF_BRANCH}
......
1069 1069
		-k uid,gid,mode,size,flags,sha256digest \
1070 1070
		-p ${STAGE_CHROOT_DIR} \
1071 1071
		-X ${_exclude_files} \
1072
		> ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/base.mtree
1072
		> ${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR}/base.mtree
1073 1073
	tar \
1074 1074
		-C ${STAGE_CHROOT_DIR} \
1075
		-cJf ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/base.txz \
1075
		-cJf ${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR}/base.txz \
1076 1076
		-X ${_exclude_files} \
1077 1077
		.
1078 1078

  
1079 1079
	# Create repo and repo-devel packages
1080
	cp -f ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo.conf \
1080
	cp -f ${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR}/${PRODUCT_NAME}-repo.conf \
1081 1081
		${STAGE_CHROOT_DIR}${PKG_REPO_PATH}
1082 1082

  
1083 1083
	core_pkg_create repo "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
1084 1084

  
1085
	cp -f ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo-devel.conf \
1085
	cp -f ${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR}/${PRODUCT_NAME}-repo-devel.conf \
1086 1086
		${STAGE_CHROOT_DIR}${PKG_REPO_PATH}
1087 1087

  
1088 1088
	core_pkg_create repo-devel "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
tools/builder_defaults.sh
310 310
export PKG_REPO_DEVEL_TEMPLATE=${PKG_REPO_TEMPLATE:-"${PKG_REPO_BASE}/${PRODUCT_NAME}-devel.conf.template"}
311 311
export PKG_REPO_PATH=${PKG_REPO_PATH:-"/usr/local/etc/pkg/repos/${PRODUCT_NAME}.conf"}
312 312

  
313
export PRODUCT_SHARE_DIR=${PRODUCT_SHARE_DIR:-"/usr/local/share/${PRODUCT_NAME}"}
314

  
313 315
# Package overlay. This gives people a chance to build product
314 316
# installable image that already contains certain extra packages.
315 317
#

Also available in: Unified diff