Attachment 1447 Details for Bug 9369 – Add "target" and "aptconf" options for "mklive-workdir" util.

[patch] Add "target" and "aptconf" options for "mklive-workdir" util.

separator-add_target_arch_aptconf.diff (text/plain), 4.93 KB, created by Vadym Kononenko on 2006-04-05 14:34:47 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Vadym Kononenko

Created: 2006-04-05 14:34:47 MSD

Size: 4.93 KB

patch

obsolete

>diff -ruaN separator-0.7.1.orig/data/functions separator-0.7.1/data/functions
>--- separator-0.7.1.orig/data/functions	2006-03-31 15:12:46 +0300
>+++ separator-0.7.1/data/functions	2006-03-31 15:34:47 +0300
>@@ -51,9 +51,10 @@
> 
> update_repo()
> {
>-    local TOPDIR
>+    local TOPDIR ARCH
>     TOPDIR=$1
>-        genbasedir --topdir=$TOPDIR --no-oldhashfile --bz2only --mapi i586 hasher &&
>+    ARCH=$2
>+        genbasedir --no-oldhashfile --bz2only --topdir=$TOPDIR --mapi "$ARCH" hasher &&
>                 Verbose "updated hasher repository indices." ||
>                 Fatal "failed to update hasher repository indices."
> }
>@@ -82,6 +83,7 @@
> 	fi
> 	echo -n "."
>     done
>+    echo ""
>     HOME=$ROOT/.in/ TMPDIR=$ROOT/tmp rpm -Uvh --root $ROOT/ --define "_install_langs $LANGS" $ROOT/.in/*.rpm
>     [ -z "$LANGS" ] || echo "%_install_langs $LANGS" >>$ROOT/etc/rpm/macros.d/langs
>     popd >/dev/null 2>&1
>@@ -228,18 +230,19 @@
> 
> updatepackages()
> {
>-    local WORKDIR APTBOX LISTS IDENT DEBUG
>+    local WORKDIR APTBOX LISTS IDENT DEBUG ARCH
>     WORKDIR=$1
>     DEBUG=$2
>     LISTS=$3
>     IDENT=$4
>+    ARCH=$5
>     APTBOX="$WORKDIR/aptbox"
>     PROFILE="$WORKDIR/profile"
>     [ -z "$LISTDIR" ] && LISTDIR="$PROFILE/packages"
>     [ -z "$IDENT" ] && IDENT="packages"
>     TMPDIR="$WORKDIR/tmp"
>     [ -d "$APTBOX" ] || Fatal "Please, create $APTBOX first"
>-    update_repo $WORKDIR/repo
>+    update_repo $WORKDIR/repo "$ARCH"
>     $APTBOX/apt-get update
>     [ -z "$DEBUG" ] || $APTBOX/apt-get install --print-uris -y `grep -h '^[^#]' $LISTS 2>/dev/null`
>     uristofile "$LISTS" "$TMPDIR/$IDENT.packages" || $APTBOX/apt-get install --print-uris -y `grep -h '^[^#]' $LISTS 2>/dev/null`
>@@ -299,6 +302,7 @@
>     Info "removing old packages ($IDENT) ..."
>     rm -f $INSTALLDIR/*
>     Info "copying new packages ($IDENT) ..."
>+
>     while read i
>     do
> 	packagestatus "$INSTALLDIRS" `basename $i` $OUTDIR || continue
>diff -ruaN separator-0.7.1.orig/scripts/mklivecd separator-0.7.1/scripts/mklivecd
>--- separator-0.7.1.orig/scripts/mklivecd	2006-03-31 15:12:46 +0300
>+++ separator-0.7.1/scripts/mklivecd	2006-03-31 15:34:47 +0300
>@@ -24,7 +24,7 @@
>   -h, --help	display help screen
>   -v, --version	display version information
>   -d, --debug 	show debug output
>-  -c, --isoonly create iso image from current out tree
>+  -c, --onlyiso create iso image from current out tree
> 		     				     
> Report bugs to <rider@altlinux.org>
> EOF
>diff -ruaN separator-0.7.1.orig/scripts/mklive-root separator-0.7.1/scripts/mklive-root
>--- separator-0.7.1.orig/scripts/mklive-root	2006-03-31 15:12:46 +0300
>+++ separator-0.7.1/scripts/mklive-root	2006-03-31 15:34:47 +0300
>@@ -103,6 +103,9 @@
> 
> . "$PROFILE/config"
> 
>+[ -z "$ARCH" ] && ARCH=$SEPARCH
>+echo "Building architecture setted to $ARCH"
>+
> #remove old root only if SKIPOUT not defined
> if [ -z "$SKIPOUT" ];then
>     [ -d $OUTDIR ] && rm -Rf $OUTDIR
>@@ -158,7 +161,7 @@
> 	DIRS=`for i in $DIRS;do echo -n "$PROFILE/$i ";done`
> 	if [ -z "$SKIPROOT" ] && [ -z "$SKIPOUT" ];then
> 	    if [ ! -z "$DIRS" ];then
>-		updatepackages $WORKDIR "$DEBUG" "$DIRS" $IDENT
>+		updatepackages $WORKDIR "$DEBUG" "$DIRS" $IDENT $ARCH
> 	    elif [ -n "$COPY" ];then
> 		add_to_lists $WORKDIR "$DEBUG" "$COPY" "$EXCLUDE" $IDENT 
> 	    fi
>diff -ruaN separator-0.7.1.orig/scripts/mklive-workdir separator-0.7.1/scripts/mklive-workdir
>--- separator-0.7.1.orig/scripts/mklive-workdir	2006-03-31 15:12:46 +0300
>+++ separator-0.7.1/scripts/mklive-workdir	2006-04-05 12:57:49 +0300
>@@ -20,8 +20,9 @@
> Valid options are:
>   -h, --help	display help screen
>   -v, --version	display version information
>-  -a, --aptconf name of alternative apt.conf
>-  -u, --update update apt-box
>+  -a, --aptconf <filename> name of alternative apt.conf
>+  -u, --update  update apt-box
>+  -t, --target  <architecture> hasher building architecture (i586 by default)
>   -p, --profile <profile> use profile instead of default
> 		     				     
> Report bugs to <rider@altlinux.org>
>@@ -32,13 +33,14 @@
> 
> 
> #parse command line options
>-TEMP=`getopt -n $PROG -o a:,v,h,u,p: -l aptconf:,version,help,update,profile: -- "$@"` || exit 1
>+TEMP=`getopt -n $PROG -o a:,v,h,u,p:,t: -l aptconf:,version,help,update,profile:,target: -- "$@"` || exit 1
> eval set -- "$TEMP"
> 
> workdir=
> deps_file=
> langs=
> update=
>+target=$SEPARCH
> profile="default"
> while :; do
> 	case "$1" in
>@@ -61,6 +63,10 @@
> 		-u|--update)
> 			update=1
> 		    ;;
>+		-t|--target)
>+			shift
>+			target="$1"
>+		    ;;
> 		--) shift; break
> 		   ;;
> 		*) "unrecognized option: $1"
>@@ -71,13 +77,19 @@
> done
> 
> WORKDIR=$@
>+APTBOX_OPTIONS=
> 
> [ -z "$WORKDIR" ] && print_usage 0
> 
> [ -d "$WORKDIR" ] || mkdir -p "$WORKDIR"
> 
>+[ -z "$target" ] || APTBOX_OPTIONS="$APTBOX_OPTIONS --target=$target"
>+
>+[ -z "$aptconf" ] || APTBOX_OPTIONS="$APTBOX_OPTIONS --apt-config=$aptconf"
>+
> [ -d "$WORKDIR/aptbox" ] && rm -Rf "$WORKDIR/aptbox"
>-/usr/bin/mkaptbox --target=$SEPARCH $WORKDIR
>+echo "Hashers architecture setted to $target"
>+/usr/bin/mkaptbox $APTBOX_OPTIONS $WORKDIR
> 
> [ -z "$update" ] || exit 0
>

Actions: View | Diff

Attachments on bug 9369: 1447