Attachment #1447 for bug #9369

View | Details | Raw Unified | Return to bug 9369
Collapse All | Expand All





update_repo()
{
    local TOPDIR ARCH
    TOPDIR=$1
    ARCH=$2
        genbasedir --no-oldhashfile --bz2only --topdir=$TOPDIR --mapi "$ARCH" hasher &&
                Verbose "updated hasher repository indices." ||
                Fatal "failed to update hasher repository indices."
}

	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


updatepackages()
{
    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 "$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`

    Info "removing old packages ($IDENT) ..."
    rm -f $INSTALLDIR/*
    Info "copying new packages ($IDENT) ..."

    while read i
    do
	packagestatus "$INSTALLDIRS" `basename $i` $OUTDIR || continue

Lines 24-30 Link Here

(-)separator-0.7.1.orig/scripts/mklivecd (-1 / +1 lines)
24	-h, --help display help screen	24	-h, --help display help screen
25	-v, --version display version information	25	-v, --version display version information
26	-d, --debug show debug output	26	-d, --debug show debug output
27	-c, --isoonly create iso image from current out tree	27	-c, --onlyiso create iso image from current out tree
28		28
29	Report bugs to <rider@altlinux.org>	29	Report bugs to <rider@altlinux.org>
30	EOF	30	EOF

Lines 103-108 Link Here

(-)separator-0.7.1.orig/scripts/mklive-root (-1 / +4 lines)
103		103
104	. "$PROFILE/config"	104	. "$PROFILE/config"
105		105
		106	[ -z "$ARCH" ] && ARCH=$SEPARCH
		107	echo "Building architecture setted to $ARCH"
		108
106	#remove old root only if SKIPOUT not defined	109	#remove old root only if SKIPOUT not defined
107	if [ -z "$SKIPOUT" ];then	110	if [ -z "$SKIPOUT" ];then
108	[ -d $OUTDIR ] && rm -Rf $OUTDIR	111	[ -d $OUTDIR ] && rm -Rf $OUTDIR
Lines 158-164 Link Here
158	DIRS=`for i in $DIRS;do echo -n "$PROFILE/$i ";done`	161	DIRS=`for i in $DIRS;do echo -n "$PROFILE/$i ";done`
159	if [ -z "$SKIPROOT" ] && [ -z "$SKIPOUT" ];then	162	if [ -z "$SKIPROOT" ] && [ -z "$SKIPOUT" ];then
160	if [ ! -z "$DIRS" ];then	163	if [ ! -z "$DIRS" ];then
161	updatepackages $WORKDIR "$DEBUG" "$DIRS" $IDENT	164	updatepackages $WORKDIR "$DEBUG" "$DIRS" $IDENT $ARCH
162	elif [ -n "$COPY" ];then	165	elif [ -n "$COPY" ];then
163	add_to_lists $WORKDIR "$DEBUG" "$COPY" "$EXCLUDE" $IDENT	166	add_to_lists $WORKDIR "$DEBUG" "$COPY" "$EXCLUDE" $IDENT
164	fi	167	fi




Valid options are:
  -h, --help	display help screen
  -v, --version	display version information
  -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>



#parse command line options
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

		-u|--update)
			update=1
		    ;;
		-t|--target)
			shift
			target="$1"
		    ;;
		--) shift; break
		   ;;
		*) "unrecognized option: $1"

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"
echo "Hashers architecture setted to $target"
/usr/bin/mkaptbox $APTBOX_OPTIONS $WORKDIR

[ -z "$update" ] || exit 0


Return to bug 9369

Lines 51-59 Link Here

(-)separator-0.7.1.orig/data/functions (-4 / +8 lines)
51		51
52	update_repo()	52	update_repo()
53	{	53	{
54	local TOPDIR	54	local TOPDIR ARCH
55	TOPDIR=$1	55	TOPDIR=$1
56	genbasedir --topdir=$TOPDIR --no-oldhashfile --bz2only --mapi i586 hasher &&	56	ARCH=$2
		57	genbasedir --no-oldhashfile --bz2only --topdir=$TOPDIR --mapi "$ARCH" hasher &&
57	Verbose "updated hasher repository indices." \|\|	58	Verbose "updated hasher repository indices." \|\|
58	Fatal "failed to update hasher repository indices."	59	Fatal "failed to update hasher repository indices."
59	}	60	}
Lines 82-87 Link Here
82	fi	83	fi
83	echo -n "."	84	echo -n "."
84	done	85	done
		86	echo ""
85	HOME=$ROOT/.in/ TMPDIR=$ROOT/tmp rpm -Uvh --root $ROOT/ --define "_install_langs $LANGS" $ROOT/.in/*.rpm	87	HOME=$ROOT/.in/ TMPDIR=$ROOT/tmp rpm -Uvh --root $ROOT/ --define "_install_langs $LANGS" $ROOT/.in/*.rpm
86	[ -z "$LANGS" ] \|\| echo "%_install_langs $LANGS" >>$ROOT/etc/rpm/macros.d/langs	88	[ -z "$LANGS" ] \|\| echo "%_install_langs $LANGS" >>$ROOT/etc/rpm/macros.d/langs
87	popd >/dev/null 2>&1	89	popd >/dev/null 2>&1
Lines 228-245 Link Here
228		230
229	updatepackages()	231	updatepackages()
230	{	232	{
231	local WORKDIR APTBOX LISTS IDENT DEBUG	233	local WORKDIR APTBOX LISTS IDENT DEBUG ARCH
232	WORKDIR=$1	234	WORKDIR=$1
233	DEBUG=$2	235	DEBUG=$2
234	LISTS=$3	236	LISTS=$3
235	IDENT=$4	237	IDENT=$4
		238	ARCH=$5
236	APTBOX="$WORKDIR/aptbox"	239	APTBOX="$WORKDIR/aptbox"
237	PROFILE="$WORKDIR/profile"	240	PROFILE="$WORKDIR/profile"
238	[ -z "$LISTDIR" ] && LISTDIR="$PROFILE/packages"	241	[ -z "$LISTDIR" ] && LISTDIR="$PROFILE/packages"
239	[ -z "$IDENT" ] && IDENT="packages"	242	[ -z "$IDENT" ] && IDENT="packages"
240	TMPDIR="$WORKDIR/tmp"	243	TMPDIR="$WORKDIR/tmp"
241	[ -d "$APTBOX" ] \|\| Fatal "Please, create $APTBOX first"	244	[ -d "$APTBOX" ] \|\| Fatal "Please, create $APTBOX first"
242	update_repo $WORKDIR/repo	245	update_repo $WORKDIR/repo "$ARCH"
243	$APTBOX/apt-get update	246	$APTBOX/apt-get update
244	[ -z "$DEBUG" ] \|\| $APTBOX/apt-get install --print-uris -y `grep -h '^[^#]' $LISTS 2>/dev/null`	247	[ -z "$DEBUG" ] \|\| $APTBOX/apt-get install --print-uris -y `grep -h '^[^#]' $LISTS 2>/dev/null`
245	uristofile "$LISTS" "$TMPDIR/$IDENT.packages" \|\| $APTBOX/apt-get install --print-uris -y `grep -h '^[^#]' $LISTS 2>/dev/null`	248	uristofile "$LISTS" "$TMPDIR/$IDENT.packages" \|\| $APTBOX/apt-get install --print-uris -y `grep -h '^[^#]' $LISTS 2>/dev/null`
Lines 299-304 Link Here
299	Info "removing old packages ($IDENT) ..."	302	Info "removing old packages ($IDENT) ..."
300	rm -f $INSTALLDIR/*	303	rm -f $INSTALLDIR/*
301	Info "copying new packages ($IDENT) ..."	304	Info "copying new packages ($IDENT) ..."
		305
302	while read i	306	while read i
303	do	307	do
304	packagestatus "$INSTALLDIRS" `basename $i` $OUTDIR \|\| continue	308	packagestatus "$INSTALLDIRS" `basename $i` $OUTDIR \|\| continue

Lines 20-27 Link Here

(-)separator-0.7.1.orig/scripts/mklive-workdir (-4 / +16 lines)
20	Valid options are:	20	Valid options are:
21	-h, --help display help screen	21	-h, --help display help screen
22	-v, --version display version information	22	-v, --version display version information
23	-a, --aptconf name of alternative apt.conf	23	-a, --aptconf <filename> name of alternative apt.conf
24	-u, --update update apt-box	24	-u, --update update apt-box
		25	-t, --target <architecture> hasher building architecture (i586 by default)
25	-p, --profile <profile> use profile instead of default	26	-p, --profile <profile> use profile instead of default
26		27
27	Report bugs to <rider@altlinux.org>	28	Report bugs to <rider@altlinux.org>
Lines 32-44 Link Here
32		33
33		34
34	#parse command line options	35	#parse command line options
35	TEMP=`getopt -n $PROG -o a:,v,h,u,p: -l aptconf:,version,help,update,profile: -- "$@"` \|\| exit 1	36	TEMP=`getopt -n $PROG -o a:,v,h,u,p:,t: -l aptconf:,version,help,update,profile:,target: -- "$@"` \|\| exit 1
36	eval set -- "$TEMP"	37	eval set -- "$TEMP"
37		38
38	workdir=	39	workdir=
39	deps_file=	40	deps_file=
40	langs=	41	langs=
41	update=	42	update=
		43	target=$SEPARCH
42	profile="default"	44	profile="default"
43	while :; do	45	while :; do
44	case "$1" in	46	case "$1" in
Lines 61-66 Link Here
61	-u\|--update)	63	-u\|--update)
62	update=1	64	update=1
63	;;	65	;;
		66	-t\|--target)
		67	shift
		68	target="$1"
		69	;;
64	--) shift; break	70	--) shift; break
65	;;	71	;;
66	*) "unrecognized option: $1"	72	*) "unrecognized option: $1"
Lines 71-83 Link Here
71	done	77	done
72		78
73	WORKDIR=$@	79	WORKDIR=$@
		80	APTBOX_OPTIONS=
74		81
75	[ -z "$WORKDIR" ] && print_usage 0	82	[ -z "$WORKDIR" ] && print_usage 0
76		83
77	[ -d "$WORKDIR" ] \|\| mkdir -p "$WORKDIR"	84	[ -d "$WORKDIR" ] \|\| mkdir -p "$WORKDIR"
78		85
		86	[ -z "$target" ] \|\| APTBOX_OPTIONS="$APTBOX_OPTIONS --target=$target"
		87
		88	[ -z "$aptconf" ] \|\| APTBOX_OPTIONS="$APTBOX_OPTIONS --apt-config=$aptconf"
		89
79	[ -d "$WORKDIR/aptbox" ] && rm -Rf "$WORKDIR/aptbox"	90	[ -d "$WORKDIR/aptbox" ] && rm -Rf "$WORKDIR/aptbox"
80	/usr/bin/mkaptbox --target=$SEPARCH $WORKDIR	91	echo "Hashers architecture setted to $target"
		92	/usr/bin/mkaptbox $APTBOX_OPTIONS $WORKDIR
81		93
82	[ -z "$update" ] \|\| exit 0	94	[ -z "$update" ] \|\| exit 0
83		95