--- trunk/mage/usr/lib/mage/smage2.sh 2006/03/22 17:45:49 351 +++ trunk/mage/usr/lib/mage/smage2.sh 2007/02/23 14:42:17 427 @@ -4,14 +4,18 @@ # needs pkgbuild_dir (mage) # SMAGE2 -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.42 2006-03-22 17:45:49 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.52 2007-02-23 14:42:17 niro Exp $ #01.10.2004 # added ccache support # added distcc support +# set default user mage.rc +: ${MAGERC="/etc/mage.rc"} + ## setup ## PKGSUFFIX="mpk" +SRCPKGSUFFIX="mpks" SMAGENAME="$1" SMAGESUFFIX="smage2" MLIBDIR=/usr/lib/mage @@ -44,7 +48,7 @@ # export default C locale export LC_ALL=C -source /etc/mage.rc +source ${MAGERC} # set PKGDIR and BUILDDIR and BINDIR to MROOT if [[ -n ${MROOT} ]] @@ -63,6 +67,7 @@ die() { xtitleclean + echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT} echo "SMAGE failed: $@" exit 1 } @@ -91,28 +96,13 @@ local i for i in ${SMAGE2RSYNC} do - rsync \ - --recursive \ - --links \ - --perms \ - --times \ - --devices \ - --timeout=600 \ - --verbose \ - --compress \ - --progress \ - --stats \ - --delete \ - --delete-after \ - ${i} ${SMAGESCRIPTSDIR} - + rsync ${RSYNC_FETCH_OPTIONS} ${i} ${SMAGESCRIPTSDIR} if [[ $? = 0 ]] then break else continue fi - done # clean up backup files (foo~) @@ -325,6 +315,8 @@ DEST=$2 fi + [[ ! -d ${DEST} ]] && install -d ${DEST} + case "${SRCFILE##*.}" in bz2) IFTAR="$(basename $SRCFILE .bz2)" @@ -362,6 +354,7 @@ PATCHOPTS=$1 PATCHFILE=$2 + echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}" patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE} } @@ -458,6 +451,9 @@ # fix DEPEND while read sym dep do + # ignore empty lines + [[ -z ${dep} ]] && continue + cat="$(dirname ${dep})" # change if not virtual if [[ ${cat} = virtual ]] @@ -546,7 +542,7 @@ > ${dest} # header - echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.42 2006-03-22 17:45:49 niro Exp $' >> ${dest} + echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.52 2007-02-23 14:42:17 niro Exp $' >> ${dest} echo >> ${dest} # pgkname and state @@ -768,6 +764,35 @@ fi } +source_pkg_build() +{ + if [[ ${PKGTYPE} = virtual ]] + then + echo "Virtual package detected; src-pkg-tarball not necessary ..." + return 0 + fi + + if [[ ! -d ${SOURCEDIR}/${PNAME} ]] + then + echo "No SRC_URI defined; src-pkg-tarball not necessary ..." + return 0 + fi + + [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly." + + echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}" + + # include the smage2 file + cp ${SMAGENAME} ${SOURCEDIR}/${PNAME} + + ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; ) + [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR} + mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} + + echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}" +} + + # print out our version showversion echo @@ -899,16 +924,62 @@ exit 0 fi +if [ "$1" == "--create-src-tarball" -a -n "$2" ] +then + # set correct SMAGENAME + SMAGENAME="$2" + MD5DIR="$(dirname ${SMAGENAME})/md5" + + echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}" + + source ${SMAGENAME} || die "regen: smage2 not found" + + if [[ -d ${SOURCEDIR}/${PNAME} ]] + then + echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}" + rm -rf ${SOURCEDIR}/${PKGNAME} + fi + + download_sources + source_pkg_build ${SMAGENAME} + exit 0 +fi + +if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ] +then + SRCPKGTARBALL="${2}" + USE_SRC_PKG_TARBALL=true + + # abort if given file is not a source pkg + [[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file." + + # set correct SMAGENAME; use the one that the src_pkg provide + # /path/to/SOURCEDIR/PNAME/SMAGENAME + SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}" + + echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}" + + [[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR} + + # unpack srctarball + [[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting." + + tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die "Error unpackung src-tarball ${SRCPKGTARBALL}" + + [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}" +fi + + [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting." [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] && die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting." -[ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your mage.rc correctly." -[ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your mage.rc correctly." -[ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your mage.rc correctly." -[ -z "${BINDIR}" ] && die "no BINDIR variable found in /etc/mage.rc" -[ -z "${CHOST}" ] && die "no CHOST variable found in /etc/mage.rc" -[ -z "${CFLAGS}" ] && die "no CFLAGS variable found in /etc/mage.rc" -[ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in /etc/mage.rc" +[ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly." +[ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your ${MAGERC} correctly." +[ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your ${MAGERC} correctly." +[ -z "${BINDIR}" ] && die "no BINDIR variable found in ${MAGERC}" +[ -z "${CHOST}" ] && die "no CHOST variable found in ${MAGERC}" +[ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}" +[ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}" source ${SMAGENAME} || die "source failed" PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}" @@ -920,8 +991,17 @@ # auto regen mage tree if requested regen_mage_tree +if [[ ${CREATE_SRC_PKG_TARBALL} = true ]] +then + if [[ -d ${SOURCEDIR}/${PNAME} ]] + then + echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}" + rm -rf ${SOURCEDIR}/${PNAME} + fi +fi + # download sources -download_sources +[[ ${USE_SRC_PKG_TARBALL} != true ]] && download_sources # fixes some issues with these functions export -f src_prepare || die "src_prepare export failed" @@ -1055,6 +1135,9 @@ echo -e "\nPackage ${PKGNAME} successfully builded.\n" fi + + # build src-pkg-tarball if requested + [[ ${CREATE_SRC_PKG_TARBALL} = true ]] && source_pkg_build ${SMAGENAME} ;; esac