/[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

Diff of /trunk/mage/usr/lib/mage/smage2.sh

Parent Directory | Revision Log | View Patch Patch

-revision 943 by niro,
Fri Nov 20 22:39:11 2009 UTC
+revision 1349 by niro,
Sat Jun  4 09:45:04 2011 UTC
 Line 50 
 export LC_ALL=C
  source /etc/mage.rc.global
  source ${MAGERC}
+ source ${MLIBDIR}/mage4.functions.sh
  # set PKGDIR and BUILDDIR and BINDIR to MROOT
  if [[ -n ${MROOT} ]]
-Line 59 
 then
+Line 60 
 then
  	export BINDIR=${MROOT}/${BINDIR}
  fi
+ # sources the smage file and uses state from distribution file if exist
+ # may helpful for repository support later on
+ smagesource()
+ {
+ 	local file="$1"
+ 	local mystate
+ 	local mycodename
+ 	source ${file}
+ 	[[ -n ${STATE} ]] && mystate="${STATE}"
+ 	# do not overide if local state was broken or disabled!
+ 	case ${STATE} in
+ 		broken) return ;;
+ 		disabled) return ;;
+ 	esac
+ 	if [ -f ${SMAGESCRIPTSDIR}/distribution ]
+ 	then
+ 		source ${SMAGESCRIPTSDIR}/distribution
+ 		[[ -n ${STATE} ]] && mystate="${STATE}"
+ 	fi
+ 	# now switch state and export it
+ 	STATE="${mystate}"
+ }
  showversion()
  {
  	echo -en "Magellan Source Install v${SMAGEVERSION} "
-Line 153 
 download_sources()
+Line 181 
 download_sources()
  	local DB_MD5_SUM_FILE="${MD5DIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).md5"
  	local FETCHING
  	local i mirror
+ 	local wget_opts
+ 	# filter wget command if busybox was found
+ 	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
  	# install SRCDIR/PNAME if not exist
  	[ ! -d ${SOURCEDIR}/${PNAME} ] && install -d ${SOURCEDIR}/${PNAME}
  	# check if FETCHING is needed
- 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )
+ 	( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} &> /dev/null )
  	if [[ $? = 0 ]]
  	then
  		# md5's ok, no fetching needed
-Line 198 
 download_sources()
+Line 229 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 222 
 download_sources()
+Line 250 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 246 
 download_sources()
+Line 271 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 270 
 download_sources()
+Line 292 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 294 
 download_sources()
+Line 313 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 313 
 download_sources()
+Line 329 
 download_sources()
  			then
  				echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
  				wget \
- 					--passive-ftp \
+ 					${wget_opts} \
- 					--tries 3 \
- 					--continue \
- 					--progress bar \
  					--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \
  					"${my_SRC_URI}"
  			fi
-Line 332 
 download_sources()
+Line 345 
 download_sources()
  	# recheck md5 sums
  	echo
  	echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
- 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"
+ 	( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} ) || die "md5 failed"
  	echo
  	# not needed anymore
-Line 520 
 mlibtoolize()
+Line 533 
 mlibtoolize()
  	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
  }
+ mautoreconf()
+ {
+ 	local opts="$@"
+ 	[[ -z ${opts} ]] && opts="--verbose --install --force"
+ 	autoreconf ${opts} || die "running: mautoreconf ${opts}"
+ }
  minstalldocs()
  {
  	local docfiles
-Line 530 
 minstalldocs()
+Line 551 
 minstalldocs()
  		install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
  	fi
+ 	local i
  	for i in ${docfiles}
  	do
- 		cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
+ 		if [ -f ${i} ]
- 		install -m 0644 ${SRCDIR}/${i}.gz \
+ 		then
- 			${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+ 			cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
+ 			install -m 0644 ${SRCDIR}/${i}.gz \
+ 				${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+ 		fi
  	done
  }
-Line 726 
 build_mage_script()
+Line 751 
 build_mage_script()
  	# now build the mage file
  	> ${dest}
- 	# header
- 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $' >> ${dest}
- 	echo  >> ${dest}
  	# pgkname and state
  	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
  	echo "STATE=\"${STATE}\"" >> ${dest}
- 	echo >> ${dest}
  	# description and homepage
  	echo "DESCRIPTION=\"${DESCRIPTION}\"" >> ${dest}
  	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
- 	echo >> ${dest}
  	# special tags and vars
  	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
  	# echo MAGE_TARGETS ## note -target is needed !
  	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
- 	echo >> ${dest}
  	# split package base
  	echo "SPLIT_PACKAGE_BASE=\"${split_pkg_base}\"" >> ${dest}
- 	echo >> ${dest}
  	# add special vars
  	if [ -n "${SPECIAL_VARS}" ]
-Line 760 
 build_mage_script()
+Line 777 
 build_mage_script()
  			# being tricky here :)
  			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
  		done
- 		echo  >> ${dest}
  	fi
  	# add at least all includes
-Line 772 
 build_mage_script()
+Line 788 
 build_mage_script()
  		do
  			echo -n " ${i}"  >> ${dest}
  		done
- 		echo  >> ${dest}
  	fi
- 	echo >> ${dest}
  	# deps and provides
  	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}
- 	echo >> ${dest}
  	echo "SDEPEND=\"$(fix_mage_deps "${target}" "${SDEPEND}")\"" >> ${dest}
- 	echo >> ${dest}
  	echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}
- 	echo >> ${dest}
  	# add special functions
  	if [ -n "${SPECIAL_FUNCTIONS}" ]
-Line 792 
 build_mage_script()
+Line 803 
 build_mage_script()
  		do
  			# add to mage (quotes needed !)
  			typeset -f "${i}" >> ${dest}
- 			echo >> ${dest}
  			# unset to be safe (quotes needed !)
  			#unset "${i}" <-- later to get every target built
  		done
- 		echo  >> ${dest}
  	fi
  	# pre|post-install|removes
  	typeset -f preinstall >> ${dest}
- 	echo  >> ${dest}
  	typeset -f postinstall >> ${dest}
- 	echo  >> ${dest}
  	typeset -f preremove >> ${dest}
- 	echo  >> ${dest}
  	typeset -f postremove >> ${dest}
- 	echo  >> ${dest}
  }
  regen_mage_tree()
-Line 844 
 regen_mage_tree()
+Line 849 
 regen_mage_tree()
  				export PNAME="${i}"
  				split_info_${i}
  				build_mage_script --split-pkg-base "${split_pkg_base}"
+ 				# restore smage environment
+ 				split_restore_variables
  			done
  			echo
- 			# restore smage environment
+ 			# unset all saved smage variables
- 			split_restore_variables
+ 			split_unset_variables
  		else
  			echo
-Line 898 
 split_save_variables()
+Line 905 
 split_save_variables()
  	export SAVED_DEPEND="${DEPEND}"
  	export SAVED_SDEPEND="${SDEPEND}"
  	export SAVED_PROVIDE="${PROVIDE}"
+ 	export SAVED_NOPKGBUILD="${NOPKGBUILD}"
+ 	# bindir too
+ 	export SAVED_BINDIR="${BINDIR}"
+ 	# export the SPLIT_PACKAGE_BASE
+ 	export SPLIT_PACKAGE_BASE="${SAVED_PNAME}"
  	# functions
  	if [[ ! -z $(typeset -f preinstall) ]]
-Line 952 
 split_restore_variables()
+Line 966 
 split_restore_variables()
  	export DEPEND="${SAVED_DEPEND}"
  	export SDEPEND="${SAVED_SDEPEND}"
  	export PROVIDE="${SAVED_PROVIDE}"
+ 	export NOPKGBUILD="${SAVED_NOPKGBUILD}"
+ 	# bindir too
+ 	export BINDIR="${SAVED_BINDIR}"
  	# functions
  	if [[ ! -z $(typeset -f SAVED_preinstall) ]]
-Line 989 
 split_restore_variables()
+Line 1007 
 split_restore_variables()
  		eval "${saved_postremove/SAVED_/}"
  		export -f postremove
  	fi
+ }
+ split_unset_variables()
+ {
  	# unset saved vars; not needed anymore
  	unset SAVED_PNAME
  	unset SAVED_PVER
-Line 1004 
 split_restore_variables()
+Line 1025 
 split_restore_variables()
  	unset SAVED_DEPEND
  	unset SAVED_SDEPEND
  	unset SAVED_PROVIDE
+ 	unset SAVED_BINDIR
+ 	unset SAVED_NOPKGBUILD
+ 	unset SPLIT_PACKAGE_BASE
  	unset -f SAVED_preinstall
  	unset -f SAVED_postinstall
  	unset -f SAVED_preremove
-Line 1133 
 step_by_step()
+Line 1157 
 step_by_step()
  {
  	if [[ ${STEP_BY_STEP} = true ]]
  	then
- 		echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
+ 		echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
  		echo "Press [enter] to continue"
  		read
  	fi
-Line 1165 
 fi
+Line 1189 
 fi
  # creates md5sums for smages to given dir
  if [[ $1 = calcmd5 ]]
  then
- 	if [ $# -ge 3 ]
+ 	if [ $# -ge 2 ]
  	then
  		SMAGENAME="$2"
  		MD5DIR="$3"
- 		source ${SMAGENAME} || die "download source failed"
+ 		[[ -z ${MD5DIR} ]] && MD5DIR="$(dirname ${SMAGENAME})/md5"
+ 		smagesource ${SMAGENAME} || die "download source failed"
  		# overridable sourcedir; must be declared after source of the smage2
  		CALC_SOURCEDIR="${CALC_SOURCEDIR:="${SOURCEDIR}/${PNAME}"}"
-Line 1221 
 then
+Line 1247 
 then
  		echo
  	else
  		echo "Usage: Calculating MD5 Sums:"
- 		echo "    $(basename $0) calcmd5 /path/to/SMAGENAME /path/to/MD5DIR"
+ 		echo "    $(basename $0) calcmd5 /path/to/SMAGENAME [/path/to/MD5DIR]"
  		echo
  		echo
  		echo "Export the CALC_SOURCEDIR variable to override current SOURCEDIRs."
-Line 1243 
 then
+Line 1269 
 then
  	# get smage
  	SMAGENAME="$2"
  	MD5DIR="$(dirname ${SMAGENAME})/md5"
- 	source ${SMAGENAME} || die "download source failed"
+ 	smagesource ${SMAGENAME} || die "download source failed"
  	download_sources
  	exit 0
-Line 1255 
 then
+Line 1281 
 then
  	# set correct SMAGENAME
  	SMAGENAME="$2"
  	MD5DIR="$(dirname ${SMAGENAME})/md5"
- 	source ${SMAGENAME} || die "regen: smage2 not found"
+ 	smagesource ${SMAGENAME} || die "regen: smage2 not found"
  	regen_mage_tree
-Line 1278 
 then
+Line 1304 
 then
  	elif [[ -n ${SPLIT_PACKAGES} ]]
  	then
  		split_save_variables
- 		for subpackage in ${SPLIT_PACKAGE}
+ 		for subpackage in ${SPLIT_PACKAGES}
  		do
  			# get the right variables for the split
  			export PNAME="${subpackage}"
-Line 1290 
 then
+Line 1316 
 then
  				--pver "${PVER}" \
  				--pbuild "${PBUILD}" \
  				--parch "${ARCH}"
+ 			# restore smage environment
+ 			split_restore_variables
  		done
- 		split_restore_variables
+ 		# unset all saved smage variables
+ 		split_unset_variables
  	else
  		# build md5sum for existing packages
-Line 1314 
 then
+Line 1343 
 then
  	echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
- 	source ${SMAGENAME} || die "regen: smage2 not found"
+ 	smagesource ${SMAGENAME} || die "regen: smage2 not found"
  	if [[ -d ${SOURCEDIR}/${PNAME} ]]
  	then
-Line 1363 
 fi
+Line 1392 
 fi
  [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}"
  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
- source ${SMAGENAME} || die "source failed"
+ smagesource ${SMAGENAME} || die "source failed"
  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
  MD5DIR="$(dirname ${SMAGENAME})/md5"
  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
-Line 1456 
 step_by_step $_
+Line 1485 
 step_by_step $_
  # build several subpackages
  if [[ -n ${SPLIT_PACKAGES} ]]
  then
- 	# save bindir
+ 	# save bindir & pname
+ 	split_save_variables
  	export SAVED_BINDIR="${BINDIR}"
  	for subpackage in ${SPLIT_PACKAGES}
  	do
-Line 1464 
 then
+Line 1494 
 then
  		then
  			# export subpackage bindir
  			export BINDIR="${SAVED_BINDIR}_${subpackage}"
+ 			# export PNAME, several internal function and include
+ 			# rely on this variable
+ 			export PNAME="${subpackage}"
+ 			echo
+ 			echo -en "${COLBLUE}*** ${COLDEFAULT}"
+ 			echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
+ 			echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
+ 			echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
  			src_install_${subpackage} | ${SMAGE_LOG_CMD}
  			die_pipestatus 0 "src_install_${subpackage} failed"
  			step_by_step $_
  		fi
  	done
- 	# restore bindir
+ 	# restore bindir & pname
- 	export BINDIR="${SAVED_BINDIR}"
+ 	split_restore_variables
- 	unset SAVED_BINDIR
+ 	# unset all saved smage variables
+ 	split_unset_variables
  else
  	src_install | ${SMAGE_LOG_CMD}
  	die_pipestatus 0 "src_install failed"
  	step_by_step $_
  fi
- echo -e "${COLGREEN}DEB${COLRED}UG!${COLDEFAULT}"
  # compressing doc, info & man files
  if [[ -n ${SPLIT_PACKAGES} ]]
  then
- 	for subpackage in ${SPLIT_PACKAGE}
+ 	for subpackage in ${SPLIT_PACKAGES}
  	do
  		mcompressdocs ${BINDIR}_${subpackage}
  	done
-Line 1500 
 case ${NOSTRIP} in
+Line 1539 
 case ${NOSTRIP} in
  	*)
  		if [[ -n ${SPLIT_PACKAGES} ]]
  		then
- 			for subpackage in ${SPLIT_PACKAGE}
+ 			for subpackage in ${SPLIT_PACKAGES}
  			do
- 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
  				mstripbins ${BINDIR}_${subpackage}
- 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
  				mstriplibs ${BINDIR}_${subpackage}
  			done
  		else
-Line 1560 
 case ${NOPKGBUILD} in
+Line 1599 
 case ${NOPKGBUILD} in
  				export PNAME="${subpackage}"
  				split_info_${PNAME}
+ 				# jump to next one if NOPKGBUILD is set in split_info
+ 				case ${NOPKGBUILD} in
+ 					true|TRUE|yes|y) continue ;;
+ 				esac
  				# check if an special subpackage_pkgbuild exists
  				if typeset -f ${PNAME}_pkgbuild > /dev/null
  				then
-Line 1580 
 case ${NOPKGBUILD} in
+Line 1624 
 case ${NOPKGBUILD} in
  					--parch "${ARCH}"
  				echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
+ 				# restore smage environment
+ 				split_restore_variables
  			done
- 			split_restore_variables
+ 			# unset all saved smage variables
+ 			split_unset_variables
  		else
  			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"

 Legend:



Removed from v.943
 


changed lines


 
Added in v.1349
 Legend:



Removed from v.943
 


changed lines


 
Added in v.1349
-Removed from v.943
+Added in v.1349