unity/Makefile.am | 2
unity/scripts/jigdofy_everything.sh | 92 --------------------------------
unity/scripts/jigdofy_respin.sh | 92 ++++++++++++++++++++++++++++++++
unity/scripts/jigdofy_single-cd_spin.sh | 4 -
4 files changed, 95 insertions(+), 95 deletions(-)
New commits:
commit 8af99db78fedb5224703772823d768a7df7245e5
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Tue Feb 2 16:31:56 2010 +0100
Fix indentation
Rename jigdo_everything -> jigdofy_respin
diff --git a/unity/Makefile.am b/unity/Makefile.am
index 6f2b662..c0b8f92 100644
--- a/unity/Makefile.am
+++ b/unity/Makefile.am
@@ -20,7 +20,7 @@ scriptdatadir = $(pkgdatadir)/unity/scripts/
scriptdata_DATA = \
scripts/find_updated_packages.sh \
scripts/gold_vs_respin.sh \
- scripts/jigdofy_everything.sh \
+ scripts/jigdofy_respin.sh \
scripts/jigdofy_everything_spin.sh \
scripts/jigdofy_release.sh \
scripts/jigdofy_single-cd_spin.sh \
diff --git a/unity/scripts/jigdofy_everything.sh
b/unity/scripts/jigdofy_everything.sh
deleted file mode 100755
index c24377b..0000000
--- a/unity/scripts/jigdofy_everything.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-function jigdofy() {
- jigdo-file make-template \
- --image=$1 \
- /data/os/distr/fedora/releases/${version}/Everything/$2/os// \
- /data/os/archive/fedora/updates/${version}/$2// \
- --label
"Base-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \
- --uri
"Base-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Everything/$2/os/";
\
- --label
"Updates-$2"="/data/os/archive/fedora/updates/${version}/$2" \
- --uri
"Updates-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/updates/${version}/$2/";
\
- --jigdo=$jigdofile \
- --template=/var/www/jigdo/templates/${datestamp}/`basename
$1`.template \
- --force --merge=$jigdofile \
- --cache=${jigdofile}.cache
-}
-
-export archs=""
-export JIGDOFY_SOURCE_ISO=0
-
-while [ $# -gt 0 ]; do
- case $1 in
- --datestamp)
- export datestamp=$2
- shift; shift
- ;;
- --version)
- export version=$2
- shift; shift
- ;;
- --source)
- export JIGDOFY_SOURCE_ISO=1
- shift
- ;;
-# --product-dir)
-# export product_dir=$2
-# shift; shift
-# ;;
-# --jigdofile)
-# export jigdofile=$2
-# shift; shift
-# ;;
- --arch)
- export archs="${archs} $2"
- shift; shift
- ;;
- esac
-done
-
-if [ -z "$datestamp" -o -z "$version" ]; then
- echo Usage: $0 --datestamp [datestamp] --version [version] --arch [arch1]
[[--arch [arch2]] [--arch [arch3]]] [--source]
- exit 1
-fi
-
-export
jigdofile=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.jigdo
-export product_dir=/data/revisor/${datestamp}/
-
-[ ! -d /var/www/jigdo/data/${datestamp} ] && mkdir -p
/var/www/jigdo/data/${datestamp}
-[ ! -d /var/www/jigdo/templates/${datestamp} ] && mkdir -p
/var/www/jigdo/templates/${datestamp}
-
-[ ! -f ${jigdofile} ] && touch ${jigdofile}
-
-for arch in ${archs}; do
- for iso in `ls ${product_dir}/f${version}-$arch-respin/iso/*.iso`; do
- jigdofy $iso $arch
- done
- cat ${product_dir}/f${version}-$arch-respin/iso/SHA1SUM >>
/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
-done
-
-if [ "${JIGDOFY_SOURCE_ISO}" == "1" ]; then
-# Jigdofy source image
- jigdo-file make-template \
-
--image=${product_dir}/f${version}-source-respin/iso/Fedora-Unity-${datestamp}-${version}-source-DVD.iso
\
- /data/os/distr/fedora/releases/${version}/Everything/source// \
- /data/os/archive/fedora/updates/${version}/SRPMS// \
- --label
"Base-Source"="/data/os/distr/fedora/releases/${version}/Everything/source" \
- --uri
"Base-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Everything/source/SRPMS/";
\
- --label
"Updates-Source"="/data/os/archive/fedora/updates/${version}/SRPMS" \
- --uri
"Updates-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/updates/${version}/SRPMS/";
\
- --jigdo=${jigdofile} \
-
--template=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}-source-DVD.iso.template
\
- --force --merge=${jigdofile} \
- --cache=${jigdofile}.cache
-
- cat ${product_dir}/f${version}-source-respin/iso/SHA1SUM >>
/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
-fi
-## Grab sha1sums
-##cat /srv/revisor/*/iso/SHA1SUM >>
/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
-
-sed -i -e "s/\+/\%2b/g" $jigdofile
-sed -i -e
"s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/${datestamp}\/F/g"
$jigdofile
-
diff --git a/unity/scripts/jigdofy_respin.sh b/unity/scripts/jigdofy_respin.sh
new file mode 100755
index 0000000..c24377b
--- /dev/null
+++ b/unity/scripts/jigdofy_respin.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+function jigdofy() {
+ jigdo-file make-template \
+ --image=$1 \
+ /data/os/distr/fedora/releases/${version}/Everything/$2/os// \
+ /data/os/archive/fedora/updates/${version}/$2// \
+ --label
"Base-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \
+ --uri
"Base-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Everything/$2/os/";
\
+ --label
"Updates-$2"="/data/os/archive/fedora/updates/${version}/$2" \
+ --uri
"Updates-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/updates/${version}/$2/";
\
+ --jigdo=$jigdofile \
+ --template=/var/www/jigdo/templates/${datestamp}/`basename
$1`.template \
+ --force --merge=$jigdofile \
+ --cache=${jigdofile}.cache
+}
+
+export archs=""
+export JIGDOFY_SOURCE_ISO=0
+
+while [ $# -gt 0 ]; do
+ case $1 in
+ --datestamp)
+ export datestamp=$2
+ shift; shift
+ ;;
+ --version)
+ export version=$2
+ shift; shift
+ ;;
+ --source)
+ export JIGDOFY_SOURCE_ISO=1
+ shift
+ ;;
+# --product-dir)
+# export product_dir=$2
+# shift; shift
+# ;;
+# --jigdofile)
+# export jigdofile=$2
+# shift; shift
+# ;;
+ --arch)
+ export archs="${archs} $2"
+ shift; shift
+ ;;
+ esac
+done
+
+if [ -z "$datestamp" -o -z "$version" ]; then
+ echo Usage: $0 --datestamp [datestamp] --version [version] --arch [arch1]
[[--arch [arch2]] [--arch [arch3]]] [--source]
+ exit 1
+fi
+
+export
jigdofile=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.jigdo
+export product_dir=/data/revisor/${datestamp}/
+
+[ ! -d /var/www/jigdo/data/${datestamp} ] && mkdir -p
/var/www/jigdo/data/${datestamp}
+[ ! -d /var/www/jigdo/templates/${datestamp} ] && mkdir -p
/var/www/jigdo/templates/${datestamp}
+
+[ ! -f ${jigdofile} ] && touch ${jigdofile}
+
+for arch in ${archs}; do
+ for iso in `ls ${product_dir}/f${version}-$arch-respin/iso/*.iso`; do
+ jigdofy $iso $arch
+ done
+ cat ${product_dir}/f${version}-$arch-respin/iso/SHA1SUM >>
/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
+done
+
+if [ "${JIGDOFY_SOURCE_ISO}" == "1" ]; then
+# Jigdofy source image
+ jigdo-file make-template \
+
--image=${product_dir}/f${version}-source-respin/iso/Fedora-Unity-${datestamp}-${version}-source-DVD.iso
\
+ /data/os/distr/fedora/releases/${version}/Everything/source// \
+ /data/os/archive/fedora/updates/${version}/SRPMS// \
+ --label
"Base-Source"="/data/os/distr/fedora/releases/${version}/Everything/source" \
+ --uri
"Base-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Everything/source/SRPMS/";
\
+ --label
"Updates-Source"="/data/os/archive/fedora/updates/${version}/SRPMS" \
+ --uri
"Updates-Source"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/updates/${version}/SRPMS/";
\
+ --jigdo=${jigdofile} \
+
--template=/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}-source-DVD.iso.template
\
+ --force --merge=${jigdofile} \
+ --cache=${jigdofile}.cache
+
+ cat ${product_dir}/f${version}-source-respin/iso/SHA1SUM >>
/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
+fi
+## Grab sha1sums
+##cat /srv/revisor/*/iso/SHA1SUM >>
/var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
+
+sed -i -e "s/\+/\%2b/g" $jigdofile
+sed -i -e
"s/Template=F/Template=http:\/\/jigdo.fedoraunity.org\/templates\/${datestamp}\/F/g"
$jigdofile
+
diff --git a/unity/scripts/jigdofy_single-cd_spin.sh
b/unity/scripts/jigdofy_single-cd_spin.sh
index f3b7ceb..0bf4f81 100755
--- a/unity/scripts/jigdofy_single-cd_spin.sh
+++ b/unity/scripts/jigdofy_single-cd_spin.sh
@@ -6,9 +6,9 @@ function jigdofy() {
/data/os/distr/fedora/releases/${version}/Fedora/$2/os// \
/data/os/distr/fedora/releases/${version}/Everything/$2/os// \
--label
"Fedora-$2"="/data/os/distr/fedora/releases/${version}/Fedora/$2/os" \
- --uri
"Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Fedora/$2/os/";
\
+ --uri
"Fedora-$2"="http://download.fedoraproject.org/pub/fedora/linux/releases/${version}/Fedora/$2/os/";
\
--label
"Everything-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \
- --uri
"Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/linux/releases/${version}/Everything/$2/os/";
\
+ --uri
"Everything-$2"="http://download.fedoraproject.org/pub/fedora/linux/releases/${version}/Everything/$2/os/";
\
--jigdo=$jigdofile \
--template=/var/www/jigdo/templates/Fedora-${version}-Single-CD/`basename
$1`.template \
--force --merge=$jigdofile \
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
