diff --git a/bin/makedist-recordvm b/bin/makedist-recordvm index ae97880..90cfe08 100755 --- a/bin/makedist-recordvm +++ b/bin/makedist-recordvm @@ -114,7 +114,6 @@ if [ ! "$ONLY_RECREATE_IMAGES" ]; then if [ ! "$VIEWMODE" ]; then echo "Capturing window output" mkdir -p $ISO_DIR/preview/ - #DBUS_SESSION_BUS_ADDRESS= HOME=$RECORDVM_DATA DISPLAY=:$X_DISPLAY dbus-launch --exit-with-session xvidcap \ --cap_geometry 1024x768+0+$VOFFSET \ --verbose 2 --gui no --audio no \ diff --git a/config/20-makedist-autobuild b/config/20-makedist-autobuild index 6e7d62b..b319fbd 100755 --- a/config/20-makedist-autobuild +++ b/config/20-makedist-autobuild @@ -1,7 +1,7 @@ #!/bin/bash # # Makedist automatic build script -# Copyright (c) 2007-2013 by Silvan Calarco +# Copyright (c) 2007-2015 by Silvan Calarco # # Usage: # @@ -14,6 +14,10 @@ . /etc/sysconfig/makedist . /usr/share/makedist/functions.inc.sh +# DO_RECORDVM=1 +DESTIMGFILEPREFIX="openmamba" +ALLMEDIASLAST=`expr ${#MEDIA_NAME[*]} - 1` + [ "$MAKEDIST_CRON_ENABLE" = "1" ] || exit 0 ME=`basename $0` @@ -33,22 +37,13 @@ SOURCEDIR=/var/makedist [ "$MAKEDIST_FORCE" ] || MAKEDIST_FORCE=1 [ "$TODAYDATE" ] || TODAYDATE=`date +%Y%m%d` [ "$WEEKDAY" ] || WEEKDAY=`date +%u` +[ "$MONTHDAY" ] || MONTHDAY=`date +%-d` [ "$DISTVERSION" ] || { echo "Error: DISTVERSION is not set, check configuration file; aborting." exit 1 } -if [ "$RELEASE" ]; then - SOURCEIMGFILEPREFIX="openmamba-$DISTVERSION" -else - SOURCEIMGFILEPREFIX="openmamba" -fi - -DESTBASEDIR=/var/ftp/pub/openmamba/$DISTVERSION/media -DESTIMGFILEPREFIX="openmamba" -ALLMEDIASLAST=`expr ${#MEDIA_NAME[*]} - 1` -DESTBASEURL=/pub/openmamba/$DISTVERSION/media # do_makedist() # @@ -63,14 +58,16 @@ DESTBASEURL=/pub/openmamba/$DISTVERSION/media # $7: architecture function do_makedist() { local DIST_CREATED=0 SOURCEIMG DESTFILENAME DESTNAME DESTLANGUAGE DESTPLATFORM DESTSUBPLATFORM DESTARCH \ - DESTPRODUCTNAME DESTDIR DESTIMG DESTMD5 DESTTORRENT + DESTVARIANT DESTPRODUCTNAME DESTDIR DESTIMG DESTMD5 DESTTORRENT DESTMILESTONE DESTFILENAME=$1 DESTNAME=$2 DESTLANGUAGE=$3 DESTPLATFORM=$4 DESTSUBPLATFORM=$5 - DESTPRODUCTNAME=$6 - DESTARCH=$7 + DESTVARIANT=$6 + DESTPRODUCTNAME=$7 + DESTARCH=$8 + DESTMILESTONE=$9 SOURCEIMG=$SOURCEDIR/${DESTFILENAME} DESTDIR=$DESTBASEDIR/${DESTPRODUCTNAME}/${DESTLANGUAGE} DESTIMG=$DESTDIR/$DESTNAME @@ -95,11 +92,16 @@ function do_makedist() { else CMD_PREFIX= fi + if [ "${DESTMILESTONE}" = "devel" ]; then + MAKEDIST_TARGET=openmamba + else + MAKEDIST_TARGET=openmamba-${DESTMILESTONE} + fi [ "$CRON_DEBUG" = "1" ] && \ - echo "-> makedist openmamba PLATFORM=${DESTPLATFORM} SUBPLATFORM=${DESTSUBPLATFORM} \ -LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE}" - makedist openmamba PLATFORM=${DESTPLATFORM} SUBPLATFORM=${DESTSUBPLATFORM} \ -LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || { + echo "-> makedist $MAKEDIST_TARGET PLATFORM=${DESTPLATFORM} SUBPLATFORM=${DESTSUBPLATFORM} \ +VARIANT=${DESTVARIANT} LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE}" + makedist $MAKEDIST_TARGET PLATFORM=${DESTPLATFORM} SUBPLATFORM=${DESTSUBPLATFORM} \ +VARIANT=${DESTVARIANT} LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || { echo "Error building openmamba ${DESTPRODUCTNAME} medium; skipping." return 255 } @@ -114,7 +116,7 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || { md5sum $DESTNAME > $DESTMD5 rm -f $DESTDIR/latest-is-*.txt > $DESTLATEST - if [ "${DESTIMG/.iso}" != "$DESTIMG" ]; then + if [ "${DO_RECORDVM}" -a "${DESTIMG/.iso}" != "$DESTIMG" ]; then # ISO image, create video preview [ ! -e $DESTDIR/preview/$DESTNAME.ogv -o $SOURCEIMG -nt $DESTDIR/preview/$DESTNAME.ogv ] && makedist-recordvm $DESTIMG fi @@ -126,7 +128,7 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || { md5sum $DESTNAME > $DESTMD5 rm -f $DESTDIR/latest-is-*.txt > $DESTLATEST - if [ "${DESTIMG/.iso}" != "$DESTIMG" ]; then + if [ "${DO_RECORDVM}" -a "${DESTIMG/.iso}" != "$DESTIMG" ]; then # ISO image, create video preview [ ! -e $DESTDIR/preview/$DESTNAME.ogv -o $SOURCEIMG -nt $DESTDIR/preview/$DESTNAME.ogv ] && makedist-recordvm $DESTIMG fi @@ -138,7 +140,7 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || { if [ "$RELEASE" ]; then cd $DESTDIR maketorrent-console \ - --comment "openmamba $RELEASE ${DESTPRODUCTNAME} ${DESTLANGUAGE}-${DESTARCH} from http://www.openmamba.org" \ + --comment "openmamba $RELEASE ${DESTPRODUCTNAME} ${DESTLANGUAGE}-${DESTARCH} from http://openmamba.org" \ --tracker_name "mambaSoft BitTorrent tracker" \ --language ${DESTLANGUAGE} \ $TORRENTURL \ @@ -146,7 +148,7 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || { else cd $DESTDIR maketorrent-console \ - --comment "openmamba snapshot $SNAPDATE ${DESTPRODUCTNAME} ${DESTLANGUAGE}-${DESTARCH} from http://www.openmamba.org" \ + --comment "openmamba snapshot $SNAPDATE ${DESTPRODUCTNAME} ${DESTLANGUAGE}-${DESTARCH} from http://openmamba.org" \ --tracker_name "mambaSoft BitTorrent tracker" \ --language ${DESTLANGUAGE} \ $TORRENTURL \ @@ -171,7 +173,8 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || { function do_makedist_and_html() { local DIST_LINE DIST_CREATED DIST_DWD HTMLLANG MEDIA_ARCH PRODNAME \ - MEDIUMFILENAME MEDIUMNAME MEDIUMPLATFORM MEDIUMSUBPLATFORM m l + MEDIUMFILENAME MEDIUMNAME MEDIUMPLATFORM MEDIUMSUBPLATFORM MEDIUMVARIANT \ + m l MEDIUMMILESTONE local tempfile2=`tempfile 2>/dev/null` || tempfile2=/tmp/makedist_tmpfile2 @@ -179,13 +182,22 @@ function do_makedist_and_html() { MEDIUMTAG=$2 MEDIUMPLATFORM=$3 MEDIUMSUBPLATFORM=$4 - HTMLLANG=$5 - PRODNAME=$6 - m=$7 - [ "${m}" ] || { + MEDIUMVARIANT=$5 + HTMLLANG=$6 + PRODNAME=$7 + m=$8 + MEDIUMMILESTONE=${MEDIA_MILESTONE[$m]} + [ "${MEDIUMMILESTONE}" ] || { echo "Error: do_makedist_and_html: invalid number of parameters; aborting." exit 1 } + if [ "${MEDIUMMILESTONE}" != "devel" ]; then + SOURCEIMGFILEPREFIX="openmamba-${MEDIUMMILESTONE}" + DESTIMGFILEPREFIX="openmamba-${MEDIUMMILESTONE}" + else + SOURCEIMGFILEPREFIX="openmamba" + DESTIMGFILEPREFIX="openmamba" + fi cat > $tempfile2 << _EOF
" >> $outputfile done @@ -406,6 +404,7 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix}" >> $outputfile + :<< _EOF block_start for a in ${MEDIA_ARCHS[i]}; do print_pkg_line $"Linux kernel ($a)" kernel $a @@ -477,8 +476,10 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix}"$"Links""\ +
  • "$"$distribution forum""\ +
  • "$"$distribution bug tracking system""\ +
  • "$"$distribution wiki""\ " >> $outputfile echo -n "

    "$"Announcement automatically generated by"" makedist $makedist_version " >> $outputfile diff --git a/makedist/makedist.sh b/makedist/makedist.sh index 8a18171..e945243 100755 --- a/makedist/makedist.sh +++ b/makedist/makedist.sh @@ -2,7 +2,7 @@ # # makedist.sh - Distribution media (CD/DVD/..) creator # -# Copyright (c) 2003-2011 by Silvan Calarco +# Copyright (c) 2003-2015 by Silvan Calarco # Copyright (c) 2003-2006 by Davide Madrisan # # This program is free software; you can redistribute it and/or modify @@ -21,7 +21,7 @@ copyleft="\ makedist media (CD/DVD/Images) creator (version $makedist_version) -Copyright (c) 2003-2011 by Silvan Calarco +Copyright (c) 2003-2015 by Silvan Calarco Copyright (c) 2003-2005 by Davide Madrisan " @@ -164,8 +164,16 @@ echo "\ Configuration: - distribution : $DISTRONAME - target : $MAKEDIST_TARGET - - platform : $PLATFORM ($MAKEDIST_TARGET/platforms/$PLATFORM) - - variant : $VARIANT + - platform : $PLATFORM ($MAKEDIST_TARGET/platforms/$PLATFORM)" +if [ "$SUBPLATFORM" ]; then +echo "\ + - subplatform : $SUBPLATFORM" +fi +if [ "$VARIANT" ]; then +echo "\ + - variant : $VARIANT" +fi +echo "\ - release : $RELEASE - target media : $MEDIA - target arch : $arch @@ -203,13 +211,8 @@ if [ ! "$KERNEL_IGNORE" ]; then { echo "$makedist_me: cannot get KERNEL_VER" >&2 { (exit 1); exit 1; }; } echo "Found Linux kernel version ${KERNEL_VER}${KERNEL_EXTRAVER}" - if [ "${KERNEL_VER:0:1}" = "2" ]; then - # kernel major release = 2 - KERNEL_MAJVER=`echo $KERNEL_VER | cut -d. -f1-3` - else - # kernel major release >= 3 - KERNEL_MAJVER=`echo $KERNEL_VER | cut -d. -f1-2` - fi + # legacy + KERNEL_MAJVER=$KERNEL_VER echo " KERNEL_PLATFORM=${KERNEL_PLATFORM} KERNEL_EXTRAVER=${KERNEL_EXTRAVER} @@ -284,32 +287,24 @@ function create_raw_disk_image() { # # parameters: # -# $1: disk image filename -# $2: disk size (MBytes) -# $3: block size -# $4: filesystem type (defaults to ext2) +# $1: disk size (MBytes) +# $2: block size - [ "$1" -a "$2" -a "$3" ] || { + [ "$1" -a "$2" ] || { echo "create_raw_disk_image: invalid number of parameters; aborting." exit 1; } - - [ "$4" ] && FS=$4 || FS=ext2 - echo "Creating raw disk image ($1)..." - umount /dev/loop2 2>/dev/null # FIXME - - rm -f $1 - losetup -d /dev/loop2 2>/dev/null + echo "Creating raw disk image..." + [ "$LOOPDEV" ] && { + umount $LOOPDEV # 2>/dev/null # FIXME + losetup -d $LOOPDEV 2>/dev/null + } test -d $MOUNTFS || mkdir -p $MOUNTFS - - dd if=/dev/zero of=$1 bs=$3 count=$2 - losetup /dev/loop2 $1 - install-mbr /dev/loop2 --force - parted -s /dev/loop2 mkpart primary ext3 1 $2 - -# mkfs -t $FS -m 0 /dev/loop2 > /dev/null -# mount /dev/loop2 $MOUNTFS || exit 1 + LOOPDEVIMGFILE=`mktemp -p $MOUNTDIR/` + dd if=/dev/zero of=$LOOPDEVIMGFILE count=$1 bs=$2 + LOOPDEV=`losetup -f` + losetup $LOOPDEV $LOOPDEVIMGFILE } function create_devices() { @@ -347,7 +342,6 @@ cat > $MOUNTDIR/etc/fstab << _END # filesystem mount-point fstype options dump fsck-order proc /proc proc defaults 0 0 devpts /dev/pts devpts gid=4,mode=620 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 none /sys sysfs defaults 0 0 _END diff --git a/var/recordvm-xinitrc b/var/recordvm-xinitrc index 26bee93..9bad400 100644 --- a/var/recordvm-xinitrc +++ b/var/recordvm-xinitrc @@ -3,10 +3,11 @@ qemu-system-x86_64 \ -enable-kvm \ -rtc base=localtime \ -usb -m 1024 \ - -soundhw hda \ -vga vmware \ -cdrom ~/recordvm.iso \ -name qemu-recordvm,process=qemu-recordvm +# -no-frame +# -soundhw hda \ # -full-screen \ # -bt hci,host \ #echo "Calling: VBOX_USER_HOME=/var/makedist/recordvm/VirtualBox /opt/VirtualBox/VBoxSDL --startvm openmamba-recordvm --fixedmode 1024 768 32 --nograbonclick --nohostkey --vram 7"

    • @@ -230,12 +242,14 @@ _EOF for l in ${MEDIA_LANGUAGES[$m]}; do if [ "$RELEASE" ]; then - latest=`ls $DESTBASEDIR/$PRODNAME/$l/latest-is-$DISTVERSION-*.txt 2>/dev/null| sed "s/.*latest-is-$DISTVERSION-\(.*\)\.txt/\1/"` + latest=`ls $DESTBASEDIR/$PRODNAME/$l/latest-is-${MEDIA_MILESTONE[i]}-*.txt 2>/dev/null| sed "s/.*latest-is-${MEDIA_MILESTONE[i]}-\(.*\)\.txt/\1/"` DESTLATESTFILENAME=latest-$latest.inc.js else DESTLATESTFILENAME=latest.inc.js fi - > $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME + DESTLATESTFILENAME2=latest.inc.php + > $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME.new + > $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME2.new case $l in it) mediumlang="italiano" ;; es) mediumlang="español" ;; @@ -251,8 +265,8 @@ _EOF if [ "$DIST_CREATED" != "255" ]; then # in case of previous build error (255) skipping building target for other langs and archs [ "$CRON_DEBUG" = "1" ] && \ - echo "do_makedist_and_html: calling do_makedist \"$SOURCEIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX}\" \"$DESTNAME\" \"${l}\" \"${MEDIUMPLATFORM}\" \"${MEDIUMSUBPLATFORM}\" \"$PRODNAME\" \"${a}\"" - do_makedist "$SOURCEIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX}" "$DESTNAME" "${l}" "${MEDIUMPLATFORM}" "${MEDIUMSUBPLATFORM}" "$PRODNAME" "${a}" + echo "do_makedist_and_html: calling do_makedist \"$SOURCEIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX}\" \"$DESTNAME\" \"${l}\" \"${MEDIUMPLATFORM}\" \"${MEDIUMSUBPLATFORM}\" \"$PRODNAME\" \"${a}\"" ${MEDIUMMILESTONE} + do_makedist "$SOURCEIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX}" "$DESTNAME" "${l}" "${MEDIUMPLATFORM}" "${MEDIUMSUBPLATFORM}" "${MEDIUMVARIANT}" "$PRODNAME" "${a}" ${MEDIUMMILESTONE} DIST_CREATED=$? [ "$DIST_CREATED" = "255" ] && return 255 @@ -263,26 +277,34 @@ _EOF DESTSIZE=`du $DESTIMG -h | gawk '{ print $1 }'` DESTMD5=`cat $DESTMD5 | gawk '{ print $1 }'` DESTBUILDDATE=`stat -c %y $DESTIMG` - cat >> $DESTDIR/$DESTLATESTFILENAME << _EOF + cat >> $DESTDIR/$DESTLATESTFILENAME.new << _EOF nameArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTNAME'; pathArray['$PRODNAME-$RELEASETAG-${l}-${a}']='/download.html?file=$DESTBASEURL/$PRODNAME/${l}/'; sizeArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTSIZE'; md5Array['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTMD5'; builddateArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTBUILDDATE'; +_EOF + cat >> $DESTDIR/$DESTLATESTFILENAME2.new << _EOF +\$releaseTag['$PRODNAME-$MEDIUMMILESTONE-${l}-${a}']='$RELEASETAG'; +\$versionMedium['$PRODNAME-$RELEASETAG-${l}-${a}']='$MEDIUMMILESTONE'; +\$nameMedium['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTNAME'; +\$pathMedium['$PRODNAME-$RELEASETAG-${l}-${a}']='/download.html?file=$DESTBASEURL/$PRODNAME/${l}/'; +\$sizeMedium['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTSIZE'; +\$md5Medium['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTMD5'; +\$builddateMedium['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTBUILDDATE'; _EOF # create short links used e.g. by unetbootin if [ -e $DESTDIR/$DESTNAME ]; then - if [ "$DISTVERSION" = "devel" ]; then - ln -sf $DESTNAME $DESTDIR/$DESTIMGFILEPREFIX-$PRODNAME-$l-snapshot.${a}.${MEDIUMSUFFIX} - else - ln -sf $DESTNAME $DESTDIR/$DESTIMGFILEPREFIX-$PRODNAME-$l-$DISTVERSION.${a}.${MEDIUMSUFFIX} - fi + # DISTVERSION is snapshot or e.g. milestone3 + ln -sf $DESTNAME $DESTDIR/$DESTIMGFILEPREFIX-$PRODNAME-$l-$DISTVERSION.${a}.${MEDIUMSUFFIX} rm -f $DESTDIR/$DESTIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX} fi fi DIST_DWD="$DIST_DWD" # DIST_DWD="$DIST_DWD ${l}-${a}" done + mv $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME.new $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME + mv $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME2.new $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME2 cat $DESTBASEDIR/$PRODNAME/$l/$DESTLATESTFILENAME >> $tempfile2 done DIST_DWD="$DIST_DWD" @@ -307,11 +329,16 @@ _EOF chmod +r $DESTHTML if [ "$DIST_CREATED" = "1" ]; then # snapshots - makedist-announcement --rebuild-announcement --send-email -y $DISTVERSION $PRODNAME + if [ "$MEDIUMMILESTONE" != "devel" ]; then + #temporary + makedist-announcement --rebuild-announcement --send-test-email -y ${MEDIUMMILESTONE} $PRODNAME + else + makedist-announcement --rebuild-announcement --send-email -y ${MEDIUMMILESTONE} $PRODNAME + fi elif [ "$RELEASEPLATFORM" = "$MEDIUMPLATFORM" -a \ "$RELEASESUBPLATFORM" = "$MEDIUMSUBPLATFORM" -a "$HTMLLANG" = "en" ]; then # stable - makedist-announcement --rebuild-announcement --send-test-email -y $DISTVERSION $PRODNAME + makedist-announcement --rebuild-announcement --send-test-email -y ${MEDIUMMILESTONE} $PRODNAME fi return $DIST_CREATED } @@ -326,14 +353,18 @@ for i in `seq 0 $ALLMEDIASLAST`; do PLATFORM=${MEDIA_PLATFORM[i]} SUBPLATFORM=${MEDIA_SUBPLATFORM[i]} + VARIANT=${MEDIA_VARIANT[i]} + DESTBASEDIR=/var/ftp/pub/openmamba/${MEDIA_MILESTONE[i]}/media + DESTBASEURL=/pub/openmamba/${MEDIA_MILESTONE[i]}/media + unset PRODUCT_NAME unset PRODUCT_NAME_OVERRIDE [ $SUBPLATFORM ] && . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$SUBPLATFORM/settings.inc . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$PLATFORM/settings.inc [ "$SUBPLATFORM" ] && \ - medium_name=`arch=_SPLIT_ PLATFORM=$SUBPLATFORM media_name` || - medium_name=`arch=_SPLIT_ media_name` + medium_name=`arch=_SPLIT_ VARIANT=$VARIANT PLATFORM=$SUBPLATFORM media_name` || + medium_name=`arch=_SPLIT_ VARIANT=$VARIANT media_name` medium_suffix=${medium_name/*_SPLIT_\./} [ $PRODUCT_NAME ] || PRODUCT_NAME=${MEDIA_NAME[i]} [ "$PRODUCT_NAME_OVERRIDE" ] && PRODUCT_NAME=$PRODUCT_NAME_OVERRIDE @@ -344,7 +375,11 @@ for i in `seq 0 $ALLMEDIASLAST`; do if [ "$RELEASE" ]; then echo "Releasing $PRODUCT_NAME media (${PLATFORM}/${SUBPLATFORM} $RELEASETAG)" SIMULATE=1 - elif [ "$WEEKDAY" = "${MEDIA_BUILDDAY[i]}" -o \ + elif [ "$WEEKDAY" = "${MEDIA_WEEKDAY[i]}" -o \ + "$FORCEBUILD" = "$PRODUCT_NAME" ]; then + echo "Building $PRODUCT_NAME media" + unset SIMULATE + elif [ "$MONTHDAY" = "${MEDIA_MONTHDAY[i]}" -o \ "$FORCEBUILD" = "$PRODUCT_NAME" ]; then echo "Building $PRODUCT_NAME media" unset SIMULATE @@ -353,12 +388,12 @@ for i in `seq 0 $ALLMEDIASLAST`; do fi if [ "$RELEASE" ]; then - latest=`ls $DESTBASEDIR/$PRODUCT_NAME/en/latest-is-$DISTVERSION-*.txt 2>/dev/null| sed "s/.*latest-is-$DISTVERSION-\(.*\)\.txt/\1/"` + latest=`ls $DESTBASEDIR/$PRODUCT_NAME/en/latest-is-${MEDIA_MILESTONE[i]}-*.txt 2>/dev/null| sed "s/.*latest-is-${MEDIA_MILESTONE[i]}-\(.*\)\.txt/\1/"` if [ "$RELEASEPLATFORM" = "$PLATFORM" -a \ "$RELEASESUBPLATFORM" = "$SUBPLATFORM" ]; then - RELEASETAG=$DISTVERSION-$RELEASE + RELEASETAG=${MEDIA_MILESTONE[i]}-$RELEASE else - RELEASETAG=$DISTVERSION-$latest + RELEASETAG=${MEDIA_MILESTONE[i]}-$latest fi SNAPDATE=$RELEASETAG else @@ -381,7 +416,7 @@ for i in `seq 0 $ALLMEDIASLAST`; do [ "$latest" -o ! "$SIMULATE" -o "$RELEASE" ] && { do_makedist_and_html \ $medium_suffix $RELEASETAG \ - $PLATFORM "$SUBPLATFORM" ${l} $PRODUCT_NAME ${i} + $PLATFORM "$SUBPLATFORM" "$VARIANT" ${l} $PRODUCT_NAME ${i} [ $? -eq 255 ] && break } done diff --git a/config/30-makedist-autobuild-cleanold b/config/30-makedist-autobuild-cleanold index 8c12532..a888604 100755 --- a/config/30-makedist-autobuild-cleanold +++ b/config/30-makedist-autobuild-cleanold @@ -1,14 +1,14 @@ #!/bin/bash # # Makedist automatic clean script -# Copyright (c) 2007-2014 by Silvan Calarco +# Copyright (c) 2007-2015 by Silvan Calarco # . /etc/sysconfig/makedist [ "$MAKEDIST_CRON_ENABLE" = "1" ] || exit 0 SOURCEDIR=/var/makedist -MILESTONES="milestone2 devel" +MILESTONES="milestone3 milestone2 devel" DESTBASEURL=/pub/openmamba/devel/media [ "$TODAYDATE" ] || TODAYDATE=`date +%Y%m%d` GLOBDOWNLOADSFILE=$DESTBASEDIR/downloads.inc @@ -34,7 +34,7 @@ for m in $MILESTONES; do # r=`basename $rl` # [ -e $d/old/$r ] && mv $d/old/$r* $d/ #done - for f in `find $d -maxdepth 1 -type f -a \( -name "*.$a.iso" -o -name "*.$a.cpio.gz" -o -name "*.$a.tar.gz" -o -name "*.$a.tar.xz" -o -name "*.$a.tar.bz2" \)`; do + for f in `find $d -maxdepth 1 -type f -a \( -name "*.$a.iso" -o -name "*.$a.cpio.gz" -o -name "*.$a.tar.gz" -o -name "*.$a.tar.xz" -o -name "*.$a.tar.bz2" -o -name "*.$a.img.gz" \)`; do echo `stat -c %Z $f` `basename $f` >> $tmpfile done filecount=0 @@ -52,25 +52,27 @@ for m in $MILESTONES; do filecount=`expr $filecount + 1` done # clean old directory - > $tmpfile - for f in `find $d/old -maxdepth 1 -name "*.$a.iso" -o -name "*.$a.cpio.gz" -o -name "*.$a.tar.gz" -o -name "*.$a.tar.xz" -o -name "*.$a.tar.bz2"`; do - echo `stat -c %Z $f` `basename $f` >> $tmpfile + if [ -d $d/old ]; then + > $tmpfile + for f in `find $d/old -maxdepth 1 -name "*.$a.iso" -o -name "*.$a.cpio.gz" -o -name "*.$a.tar.gz" -o -name "*.$a.tar.xz" -o -name "*.$a.tar.bz2" -o -name "*.$a.img.gz"`; do + echo `stat -c %Z $f` `basename $f` >> $tmpfile + done + SNAPSHOT_DATE= + for f in `cat $tmpfile | sort -r | awk '{ print $2 }' `; do + SNAPSHOT_DATE_PREVIOUS=$SNAPSHOT_DATE + SNAPSHOT_DATE=`echo $f | sed "s|.*snapshot-\([0-9]*\)\..*|\1|"` + if [ "${SNAPSHOT_DATE:0:6}" = "${SNAPSHOT_DATE_PREVIOUS:0:6}" ]; then + [ "$VERBOSE" -o "$SIMULATE" ] && echo "DELE old/$f ($SNAPSHOT_DATE)" + [ "$SIMULATE" ] && continue + rm -f $d/old/$f + [ -e $d/old/$f.MD5.txt ] && rm -f $d/old/$f.MD5.txt + [ -e $d/old/$f.torrent ] && rm -f $d/old/$f.torrent + else + [ "$VERBOSE" -o "$SIMULATE" ] && echo "KEEP old/$f ($SNAPSHOT_DATE)" + fi + done + fi done - SNAPSHOT_DATE= - for f in `cat $tmpfile | sort -r | awk '{ print $2 }' `; do - SNAPSHOT_DATE_PREVIOUS=$SNAPSHOT_DATE - SNAPSHOT_DATE=`echo $f | sed "s|.*snapshot-\([0-9]*\)\..*|\1|"` - if [ "${SNAPSHOT_DATE:0:6}" = "${SNAPSHOT_DATE_PREVIOUS:0:6}" ]; then - [ "$VERBOSE" -o "$SIMULATE" ] && echo "DELE old/$f ($SNAPSHOT_DATE)" - [ "$SIMULATE" ] && continue - rm -f $d/old/$f - [ -e $d/old/$f.MD5.txt ] && rm -f $d/old/$f.MD5.txt - [ -e $d/old/$f.torrent ] && rm -f $d/old/$f.torrent - else - [ "$VERBOSE" -o "$SIMULATE" ] && echo "KEEP old/$f ($SNAPSHOT_DATE)" - fi - done - done # echo # ls --sort=time $d/*.iso $d/*.cpio.gz #find $DESTBASEDIR -name *.iso diff --git a/config/config b/config/config index bbab2a7..0612256 100644 --- a/config/config +++ b/config/config @@ -13,8 +13,14 @@ if [ "$ARCH" = "i586" ]; then REPOSITORY=( /var/ftp/pub/openmamba/devel /var/ftp/pub/openmamba/devel-games -/var/ftp/pub/openmamba/devel-makedist ) +#/var/ftp/pub/openmamba/devel-makedist +elif [ "$ARCH" = "x86_64" ]; then +REPOSITORY=( +/var/ftp/pub/openmamba/devel +/var/ftp/pub/openmamba/devel-games +) +#/var/ftp/pub/openmamba/devel-makedist else REPOSITORY=( /var/ftp/pub/openmamba/devel diff --git a/config/makedist b/config/makedist index d5fc086..c99eb83 100644 --- a/config/makedist +++ b/config/makedist @@ -6,15 +6,15 @@ HTML_LANGS="it en" # enable cron for autobuilds -MAKEDIST_CRON_ENABLE=0 +MAKEDIST_CRON_ENABLE=1 # announcements configuration -#ANNOUNCEMENTS_SIGNER="Signer Name" -#ANNOUNCEMENTS_EMAILS_TEST="test@example.com" -#ANNOUNCEMENTS_EMAILS_STABLE_EN="stable-users@example.com" -#ANNOUNCEMENTS_EMAILS_STABLE_IT="utenti-stabile@example.com" -#ANNOUNCEMENTS_EMAILS_DEVEL_EN="devel-users@example.com" -#ANNOUNCEMENTS_EMAILS_DEVEL_IT="utenti-devel@example.com" +ANNOUNCEMENTS_SIGNER="Silvan Calarco" +ANNOUNCEMENTS_EMAILS_TEST="test@openmamba.org" +ANNOUNCEMENTS_EMAILS_STABLE_EN="openmamba-users@openmamba.org openmamba-devel@openmamba.org distro@distrowatch.com" +ANNOUNCEMENTS_EMAILS_STABLE_IT="openmamba-users-it@openmamba.org openmamba-devel-it@openmamba.org" +ANNOUNCEMENTS_EMAILS_DEVEL_EN="openmamba-devel@openmamba.org" +ANNOUNCEMENTS_EMAILS_DEVEL_IT="openmamba-devel-it@openmamba.org" # # media configuration @@ -24,116 +24,182 @@ if [ "$RELEASE" ]; then case "$DISTVERSION" in milestone1) - DESTBASEDIR=/var/ftp/pub/openmamba/$DISTVERSION/media - + MEDIA_MILESTONE[0]=milestone1 MEDIA_NAME[0]=livecd MEDIA_TARGET[0]=openmamba MEDIA_PLATFORM[0]=livecd MEDIA_SUBPLATFORM[0]=livecd-root MEDIA_LANGUAGES[0]="it en" MEDIA_ARCHS[0]="i586" - MEDIA_BUILDDAY[0]=8 + MEDIA_WEEKDAY[0]=8 + MEDIA_MILESTONE[1]=milestone1 MEDIA_NAME[1]=livestudio MEDIA_TARGET[1]=openmamba MEDIA_PLATFORM[1]=livecd MEDIA_SUBPLATFORM[1]=livestudio-root MEDIA_LANGUAGES[1]="it en" MEDIA_ARCHS[1]="i586" - MEDIA_BUILDDAY[1]=8 + MEDIA_WEEKDAY[1]=8 + MEDIA_MILESTONE[2]=milestone1 MEDIA_NAME[2]=installdvd MEDIA_TARGET[2]=openmamba MEDIA_PLATFORM[2]=installdvd MEDIA_SUBPLATFORM[2]=livecd-root MEDIA_LANGUAGES[2]="it en" MEDIA_ARCHS[2]="i586" - MEDIA_BUILDDAY[2]=8 + MEDIA_WEEKDAY[2]=8 + MEDIA_MILESTONE[3]=milestone1 MEDIA_NAME[3]=bootusb MEDIA_TARGET[3]=openmamba MEDIA_PLATFORM[3]=bootusb MEDIA_SUBPLATFORM[3]= MEDIA_LANGUAGES[3]="it en" MEDIA_ARCHS[3]="i586" - MEDIA_BUILDDAY[3]=8 + MEDIA_WEEKDAY[3]=8 ;; milestone2) - DESTBASEDIR=/var/ftp/pub/openmamba/$DISTVERSION/media - + MEDIA_MILESTONE[0]=milestone2 MEDIA_NAME[0]=livedvd MEDIA_TARGET[0]=openmamba MEDIA_PLATFORM[0]=livedvd MEDIA_SUBPLATFORM[0]=livedvd-root MEDIA_LANGUAGES[0]="it en es" MEDIA_ARCHS[0]="i586" - MEDIA_BUILDDAY[0]=8 + MEDIA_WEEKDAY[0]=8 + MEDIA_MILESTONE[1]=milestone2 MEDIA_NAME[1]=livecd MEDIA_TARGET[1]=openmamba MEDIA_PLATFORM[1]=livecd MEDIA_SUBPLATFORM[1]=livecd-root MEDIA_LANGUAGES[1]="it en es" MEDIA_ARCHS[1]="i586" - MEDIA_BUILDDAY[1]=8 + MEDIA_WEEKDAY[1]=8 +# MEDIA_MILESTONE[2]=milestone2 # MEDIA_NAME[2]=livegames # MEDIA_TARGET[2]=openmamba # MEDIA_PLATFORM[2]=livecd # MEDIA_SUBPLATFORM[2]=livegames-root # MEDIA_LANGUAGES[2]="it en es" # MEDIA_ARCHS[2]="i586" -# MEDIA_BUILDDAY[2]=8 +# MEDIA_WEEKDAY[2]=8 + MEDIA_MILESTONE[2]=milestone2 MEDIA_NAME[2]=livecd-gnome MEDIA_TARGET[2]=openmamba MEDIA_PLATFORM[2]=livecd MEDIA_SUBPLATFORM[2]=livecd-gnome-root MEDIA_LANGUAGES[2]="it en es" MEDIA_ARCHS[2]="i586" - MEDIA_BUILDDAY[2]=8 + MEDIA_WEEKDAY[2]=8 + MEDIA_MILESTONE[3]=milestone2 MEDIA_NAME[3]=livecd-light MEDIA_TARGET[3]=openmamba MEDIA_PLATFORM[3]=livecd MEDIA_SUBPLATFORM[3]=livecd-light-root MEDIA_LANGUAGES[3]="it en es" MEDIA_ARCHS[3]="i586" - MEDIA_BUILDDAY[3]=8 + MEDIA_WEEKDAY[3]=8 + MEDIA_MILESTONE[4]=milestone2 MEDIA_NAME[4]=bootusb MEDIA_TARGET[4]=openmamba MEDIA_PLATFORM[4]=bootusb MEDIA_SUBPLATFORM[4]= MEDIA_LANGUAGES[4]="it en es" MEDIA_ARCHS[4]="i586" - MEDIA_BUILDDAY[4]=8 + MEDIA_WEEKDAY[4]=8 +# MEDIA_MILESTONE[5]=milestone2 # MEDIA_NAME[5]=sdk-root # MEDIA_TARGET[5]=openmamba # MEDIA_PLATFORM[5]=sdk-root # MEDIA_SUBPLATFORM[5]= # MEDIA_LANGUAGES[5]="it en es" # MEDIA_ARCHS[5]="arm i586" -# MEDIA_BUILDDAY[5]=8 +# MEDIA_WEEKDAY[5]=8 + MEDIA_MILESTONE[5]=milestone2 MEDIA_NAME[5]=rootfs-light MEDIA_TARGET[5]=openmamba MEDIA_PLATFORM[5]=rootfs-light MEDIA_SUBPLATFORM[5]= MEDIA_LANGUAGES[5]="it en es" MEDIA_ARCHS[5]="arm i586" - MEDIA_BUILDDAY[5]=8 + MEDIA_WEEKDAY[5]=8 + MEDIA_MILESTONE[6]=milestone2 MEDIA_NAME[6]=rootfs MEDIA_TARGET[6]=openmamba MEDIA_PLATFORM[6]=rootfs MEDIA_SUBPLATFORM[6]= MEDIA_LANGUAGES[6]="it en es" MEDIA_ARCHS[6]="arm i586" - MEDIA_BUILDDAY[6]=8 + MEDIA_WEEKDAY[6]=8 + + ;; + milestone3) + + MEDIA_MILESTONE[0]=milestone3 + MEDIA_NAME[0]=livedvd + MEDIA_TARGET[0]=openmamba + MEDIA_PLATFORM[0]=livedvd + MEDIA_SUBPLATFORM[0]=livedvd-root + MEDIA_LANGUAGES[0]="en" + MEDIA_ARCHS[0]="x86_64 i586" + MEDIA_WEEKDAY[0]=6 + + MEDIA_MILESTONE[1]=milestone3 + MEDIA_NAME[1]=livecd + MEDIA_TARGET[1]=openmamba + MEDIA_PLATFORM[1]=livecd + MEDIA_SUBPLATFORM[1]=livecd-root + MEDIA_LANGUAGES[1]="it en es" + MEDIA_ARCHS[1]="i586 x86_64" + MEDIA_WEEKDAY[1]=8 + + MEDIA_MILESTONE[2]=milestone3 + MEDIA_NAME[2]=livecd-gnome + MEDIA_TARGET[2]=openmamba + MEDIA_PLATFORM[2]=livecd + MEDIA_SUBPLATFORM[2]=livecd-gnome-root + MEDIA_LANGUAGES[2]="it en es" + MEDIA_ARCHS[2]="i586 x86_64" + MEDIA_WEEKDAY[2]=8 + + MEDIA_MILESTONE[3]=milestone3 + MEDIA_NAME[3]=livecd-light + MEDIA_TARGET[3]=openmamba + MEDIA_PLATFORM[3]=livecd + MEDIA_SUBPLATFORM[3]=livecd-light-root + MEDIA_LANGUAGES[3]="it en es" + MEDIA_ARCHS[3]="i586 x86_64" + MEDIA_WEEKDAY[3]=8 + + MEDIA_MILESTONE[4]=milestone3 + MEDIA_NAME[4]=rootfs-light + MEDIA_TARGET[4]=openmamba + MEDIA_PLATFORM[4]=rootfs-light + MEDIA_SUBPLATFORM[4]= + MEDIA_LANGUAGES[4]="it en es" + MEDIA_ARCHS[4]="arm i586 x86_64" + MEDIA_WEEKDAY[4]=8 + + MEDIA_MILESTONE[5]=milestone3 + MEDIA_NAME[5]=rootfs + MEDIA_TARGET[5]=openmamba + MEDIA_PLATFORM[5]=rootfs + MEDIA_SUBPLATFORM[5]= + MEDIA_LANGUAGES[5]="it en es" + MEDIA_ARCHS[5]="arm i586 x86_64" + MEDIA_WEEKDAY[5]=8 ;; *) @@ -143,103 +209,136 @@ if [ "$RELEASE" ]; then esac else - DISTVERSION=devel - DESTBASEDIR=/var/ftp/pub/openmamba/$DISTVERSION/media + DISTVERSION=snapshot + MEDIA_MILESTONE[0]=devel MEDIA_NAME[0]=livecd MEDIA_TARGET[0]=openmamba MEDIA_PLATFORM[0]=livecd MEDIA_SUBPLATFORM[0]=livecd-root + MEDIA_VARIANT[0]= MEDIA_LANGUAGES[0]="it en es" MEDIA_ARCHS[0]="i586 x86_64" - MEDIA_BUILDDAY[0]=5 + MEDIA_WEEKDAY[0]=1 + MEDIA_MILESTONE[1]=devel MEDIA_NAME[1]=livedvd MEDIA_TARGET[1]=openmamba MEDIA_PLATFORM[1]=livedvd MEDIA_SUBPLATFORM[1]=livedvd-root + MEDIA_VARIANT[1]= MEDIA_LANGUAGES[1]="en" MEDIA_ARCHS[1]="i586 x86_64" - MEDIA_BUILDDAY[1]=6 + MEDIA_WEEKDAY[1]=2 + MEDIA_MILESTONE[2]=devel MEDIA_NAME[2]=livecd-light MEDIA_TARGET[2]=openmamba MEDIA_PLATFORM[2]=livecd MEDIA_SUBPLATFORM[2]=livecd-light-root + MEDIA_VARIANT[2]= MEDIA_LANGUAGES[2]="it en es" MEDIA_ARCHS[2]="i586 x86_64" - MEDIA_BUILDDAY[2]=2 + MEDIA_WEEKDAY[2]=3 + MEDIA_MILESTONE[3]=devel MEDIA_NAME[3]=livecd-gnome MEDIA_TARGET[3]=openmamba MEDIA_PLATFORM[3]=livecd MEDIA_SUBPLATFORM[3]=livecd-gnome-root + MEDIA_VARIANT[3]= MEDIA_LANGUAGES[3]="it en es" - MEDIA_ARCHS[3]="i586" - MEDIA_BUILDDAY[3]=3 + MEDIA_ARCHS[3]="i586 x86_64" + MEDIA_WEEKDAY[3]=4 + MEDIA_MILESTONE[4]=devel MEDIA_NAME[4]=testcd MEDIA_TARGET[4]=openmamba MEDIA_PLATFORM[4]=testcd MEDIA_SUBPLATFORM[4]=testcd-root + MEDIA_VARIANT[4]= MEDIA_LANGUAGES[4]="it en es" - MEDIA_ARCHS[4]="i586" - MEDIA_BUILDDAY[4]=1 + MEDIA_ARCHS[4]="x86_64" + MEDIA_WEEKDAY[4]=8 + MEDIA_MILESTONE[5]=devel MEDIA_NAME[5]=rootfs MEDIA_TARGET[5]=openmamba MEDIA_PLATFORM[5]=rootfs MEDIA_SUBPLATFORM[5]= + MEDIA_VARIANT[5]= MEDIA_LANGUAGES[5]="it en es" - MEDIA_ARCHS[5]="arm i586" - MEDIA_BUILDDAY[5]=4 + MEDIA_ARCHS[5]="arm i586 x86_64" + MEDIA_MONTHDAY[5]=15 + MEDIA_MILESTONE[6]=devel MEDIA_NAME[6]=rootfs-light MEDIA_TARGET[6]=openmamba MEDIA_PLATFORM[6]=rootfs-light MEDIA_SUBPLATFORM[6]= + MEDIA_VARIANT[6]= MEDIA_LANGUAGES[6]="it en es" MEDIA_ARCHS[6]="arm i586 x86_64" - MEDIA_BUILDDAY[6]=7 + MEDIA_MONTHDAY[6]=20 -# MEDIA_NAME[7]=bootcd -# MEDIA_TARGET[7]=openmamba -# MEDIA_PLATFORM[7]=bootcd -# MEDIA_SUBPLATFORM[7]= -# MEDIA_LANGUAGES[7]="it en es" -# MEDIA_ARCHS[7]="i586 x86_64" -# MEDIA_BUILDDAY[7]=3 + MEDIA_MILESTONE[7]=devel + MEDIA_NAME[7]=diskimg-bananapi + MEDIA_TARGET[7]=openmamba + MEDIA_PLATFORM[7]=diskimg + MEDIA_SUBPLATFORM[7]= + MEDIA_VARIANT[7]=bananapi + MEDIA_LANGUAGES[7]="it en es" + MEDIA_ARCHS[7]="arm" + MEDIA_MONTHDAY[7]=21 -# MEDIA_NAME[3]=livegames -# MEDIA_TARGET[3]=openmamba -# MEDIA_PLATFORM[3]=livecd -# MEDIA_SUBPLATFORM[3]=livegames-root -# MEDIA_LANGUAGES[3]="it en es" -# MEDIA_ARCHS[3]="i586" -# MEDIA_BUILDDAY[3]=8 + MEDIA_MILESTONE[8]=devel + MEDIA_NAME[8]=diskimg-raspberrypi + MEDIA_TARGET[8]=openmamba + MEDIA_PLATFORM[8]=diskimg + MEDIA_SUBPLATFORM[8]= + MEDIA_VARIANT[8]=raspberrypi + MEDIA_LANGUAGES[8]="it en es" + MEDIA_ARCHS[8]="arm" + MEDIA_MONTHDAY[8]=21 -# MEDIA_NAME[5]=bootusb -# MEDIA_TARGET[5]=openmamba -# MEDIA_PLATFORM[5]=bootusb -# MEDIA_SUBPLATFORM[5]= -# MEDIA_LANGUAGES[5]="it en es" -# MEDIA_ARCHS[5]="i586 x86_64" -# MEDIA_BUILDDAY[5]=7 + MEDIA_MILESTONE[9]=devel + MEDIA_NAME[9]=diskimg-livecd + MEDIA_TARGET[9]=openmamba + MEDIA_PLATFORM[9]=diskimg + MEDIA_SUBPLATFORM[9]= + MEDIA_VARIANT[9]=livecd + MEDIA_LANGUAGES[9]="it en es" + MEDIA_ARCHS[9]="x86_64 i586" + MEDIA_WEEKDAY[9]=2 -# MEDIA_NAME[7]=bootusb-test -# MEDIA_TARGET[7]=openmamba -# MEDIA_PLATFORM[7]=bootusb-test -# MEDIA_SUBPLATFORM[7]= -# MEDIA_LANGUAGES[7]="it en es" -# MEDIA_ARCHS[7]="i586" -# MEDIA_BUILDDAY[7]=7 + MEDIA_MILESTONE[10]=devel + MEDIA_NAME[10]=diskimg-cubox + MEDIA_TARGET[10]=openmamba + MEDIA_PLATFORM[10]=diskimg + MEDIA_SUBPLATFORM[10]= + MEDIA_VARIANT[10]=cubox + MEDIA_LANGUAGES[10]="it en es" + MEDIA_ARCHS[10]="arm" + MEDIA_MONTHDAY[10]=21 -# MEDIA_NAME[8]=sdk-root -# MEDIA_TARGET[8]=openmamba -# MEDIA_PLATFORM[8]=sdk-root -# MEDIA_SUBPLATFORM[8]= -# MEDIA_LANGUAGES[8]="it en es" -# MEDIA_ARCHS[8]="arm i586" -# MEDIA_BUILDDAY[8]=8 + MEDIA_MILESTONE[11]=milestone3 + MEDIA_NAME[11]=livecd + MEDIA_TARGET[11]=openmamba + MEDIA_PLATFORM[11]=livecd + MEDIA_SUBPLATFORM[11]=livecd-root + MEDIA_VARIANT[11]= + MEDIA_LANGUAGES[11]="it en es" + MEDIA_ARCHS[11]="i586 x86_64" + MEDIA_MONTHDAY[11]=8 + + MEDIA_MILESTONE[12]=devel + MEDIA_NAME[12]=rootfs-base + MEDIA_TARGET[12]=openmamba + MEDIA_PLATFORM[12]=rootfs-base + MEDIA_SUBPLATFORM[12]= + MEDIA_VARIANT[12]= + MEDIA_LANGUAGES[12]="en" + MEDIA_ARCHS[12]="arm i586 x86_64" + MEDIA_MONTHDAY[12]=14 fi diff --git a/makedist/VERSION b/makedist/VERSION index 5817ed7..a3b5796 100644 --- a/makedist/VERSION +++ b/makedist/VERSION @@ -1 +1 @@ -makedist_version=2.5 +makedist_version=2.5.1 diff --git a/makedist/defs.inc.sh b/makedist/defs.inc.sh index 3c987c6..cc3afa9 100644 --- a/makedist/defs.inc.sh +++ b/makedist/defs.inc.sh @@ -148,6 +148,7 @@ cat > $LOCALSTATEDIR/.defs.inc << _EOF # but look in defs.inc.sh. # DISTRONAME=$DISTRONAME +SUBPLATFORM=$PASSED_SUBPLATFORM RELEASE=$RELEASE VARIANT=$VARIANT LOCALSTATEDIR=$LOCALSTATEDIR diff --git a/makedist/functions.inc.sh b/makedist/functions.inc.sh index 7bd5f79..317a6e3 100644 --- a/makedist/functions.inc.sh +++ b/makedist/functions.inc.sh @@ -94,8 +94,11 @@ function initialize_root_dir() { mkdir $MOUNTDIR/proc mount -o bind /proc $MOUNTDIR/proc - trap "[ -e $MOUNTDIR/proc/version ] && umount $MOUNTDIR/proc; [ \"$MOUNTDIR_TMPFS\" ] && umount $MOUNTDIR_TMPFS" 0 HUP INT QUIT ABRT KILL TERM + #[ $MEDIA = "raw" ] && create_raw_filesystem $LOCALSTATEDIR/$MEDIA_NAME $MEDIA_SIZE 1024k $ROOTFS + [ $MEDIA = "raw" ] && create_raw_disk_image $MEDIA_SIZE 1024k + + trap "[ $LOOPDEV ] && losetup -d $LOOPDEV; [ -e $MOUNTDIR/proc/version ] && umount $MOUNTDIR/proc; [ \"$MOUNTDIR_TMPFS\" ] && umount $MOUNTDIR_TMPFS" 0 HUP INT QUIT ABRT KILL TERM } function create_rpm_database() { @@ -230,7 +233,6 @@ function expand_srpm_names() { function get_rpm_version() { set_rpm_dirs - find $RPM_DIRS -maxdepth 1 -regex ".*/${1}-[^-]*-[^-]*" | \ grep -m 1 "" | \ sed "s|.*/${1}-\([^-]*\)-[^-]*|\1|" @@ -972,13 +974,15 @@ function medium_name() { [ "$1" ] && MEDIA=$1 [ "$2" ] && MEDIA_LABEL=$2 + MEDIUM_NAME= if [ "$DISTRONAME" = "${MAKEDIST_TARGET:0:${#DISTRONAME}}" ]; then MEDIUM_NAME=$MAKEDIST_TARGET-$PLATFORM - elif [ "$VARIANT" != "" ]; then - MEDIUM_NAME=$DISTRONAME-$MAKEDIST_TARGET-$VARIANT else MEDIUM_NAME=$DISTRONAME-$MAKEDIST_TARGET-$PLATFORM fi + if [ "$VARIANT" != "" ]; then + MEDIUM_NAME=$MEDIUM_NAME-$VARIANT + fi [ "$LANGUAGE" ] && MEDIUM_NAME=$MEDIUM_NAME-$LANGUAGE @@ -1007,7 +1011,7 @@ function medium_name() { MEDIUM_NAME=$MEDIUM_NAME.$arch.iso ;; raw|RAW) - MEDIUM_NAME=$MEDIUM_NAME.$arch.img + MEDIUM_NAME=$MEDIUM_NAME.$arch.img.gz ;; qemu|QEMU) MEDIUM_NAME=$MEDIUM_NAME.$arch.qcow2 @@ -1106,9 +1110,8 @@ grub-mkrescue --output=$LOCALSTATEDIR/$MEDIUM_FILENAME $MOUNTDIR" } ;; raw|RAW) - echo "Producting raw image $MEDIUM_FILENAME..." - umount $MOUNTDIR - losetup -d /dev/loop2 + echo "Producing raw image $MEDIUM_FILENAME..." + gzip -c $LOOPDEVIMGFILE > $LOCALSTATEDIR/$MEDIUM_FILENAME ;; qemu|QEMU) ROOTFS_SIZE=`du -ms $MOUNTDIR | awk '{ print $1; }'` diff --git a/makedist/makedist-announcement.sh b/makedist/makedist-announcement.sh index fa1033d..0c800a3 100755 --- a/makedist/makedist-announcement.sh +++ b/makedist/makedist-announcement.sh @@ -1,17 +1,14 @@ #!/bin/bash # # makedist-announcement.sh - a makedist component which produces announcements -# Copyright (c) 2012-2013 by Silvan Calarco +# Copyright (c) 2012-2014 by Silvan Calarco # . /usr/share/makedist/VERSION distribution=openmamba mediumlang=en -siteaddress=www.openmamba.org +siteaddress=openmamba.org sitedomain=openmamba.org -forumaddress=forum.openmamba.org -bugsaddress=bugs.openmamba.org -wikiaddress=wiki.openmamba.org TEXTDOMAIN="makedist"; export TEXTDOMAIN @@ -260,6 +257,7 @@ done mediumplatform=${MEDIA_PLATFORM[i]} mediumsubplatform=${MEDIA_SUBPLATFORM[i]} +mediumvariant=${MEDIA_VARIANT[i]} webmediumdir=pub/$distribution/media/$distversion/$mediumname mediumdir=/var/ftp/$webmediumdir @@ -267,22 +265,22 @@ mediumdir=/var/ftp/$webmediumdir if [ $mediumsubplatform ]; then . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$mediumsubplatform/settings.inc - medium_name=`arch=_SPLIT_ PLATFORM=$mediumsubplatform media_name` + medium_name=`arch=_SPLIT_ VARIANT=$mediumvariant PLATFORM=$mediumsubplatform media_name` sub_medium_suffix=${medium_name/*_SPLIT_\./} sub_medium_name=${medium_name/\._SPLIT_*/} . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$mediumplatform/settings.inc - medium_name=`arch=_SPLIT_ PLATFORM=$mediumplatform media_name` + medium_name=`arch=_SPLIT_ VARIANT=$mediumvariant PLATFORM=$mediumplatform media_name` medium_suffix=${medium_name/*_SPLIT_\./} medium_name=${medium_name/\._SPLIT_*/} else . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$mediumplatform/settings.inc - medium_name=`arch=_SPLIT_ PLATFORM=$mediumplatform media_name` + medium_name=`arch=_SPLIT_ VARIANT=$mediumvariant PLATFORM=$mediumplatform media_name` medium_suffix=${medium_name/*_SPLIT_\./} medium_name=${medium_name/\._SPLIT_*/} sub_medium_suffix=${medium_suffix} sub_medium_name=${medium_name} fi - +echo $medium_name [ -e /var/makedist/.$sub_medium_name-$mediumlang.$mediumarch.$sub_medium_suffix.distinfo ] || { echo "Error: missing distinfo file /var/makedist/.$sub_medium_name-$mediumlang.$mediumarch.$sub_medium_suffix.distinfo; aborting." exit 1 @@ -328,7 +326,7 @@ if [ ! -e $outputfile -o "$REBUILDANNOUNCEMENT" = "1" ]; then echo $"Generating announcement for"" $distribution $distversion ${MEDIA_NAME[i]}"" ($outputlang)" if [ -e "$mediumdir/$outputlang/preview/preview-i586-$version.jpg" ]; then - IMG_ADD="" + IMG_ADD="" else IMG_ADD="" fi @@ -376,7 +374,7 @@ if [ ! -e $outputfile -o "$REBUILDANNOUNCEMENT" = "1" ]; then *) echo -n $"unknown" >> $outputfile ;; esac echo "${a}\ -\ +\ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix} $mediumsizeMB MB$mediumdate$mediummd5