mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'upgpkg: fixed cvs building without local cvs'
This commit is contained in:
parent
32eb1b354a
commit
4b232564b3
3 changed files with 9 additions and 9 deletions
|
@ -15,7 +15,7 @@ install ()
|
||||||
rm ${CVSMSG}
|
rm ${CVSMSG}
|
||||||
mkdir -p ${CVSMSG}
|
mkdir -p ${CVSMSG}
|
||||||
# checkout actual name from cvs rc.sysinit
|
# checkout actual name from cvs rc.sysinit
|
||||||
export CVSROOT=${CVSSETUP}
|
export CVSROOT=${ARCH_CVSSETUP}
|
||||||
cd ${CVSMSG}
|
cd ${CVSMSG}
|
||||||
cvs -z3 co -r ${TAG} arch/build/base/initscripts/rc.sysinit
|
cvs -z3 co -r ${TAG} arch/build/base/initscripts/rc.sysinit
|
||||||
NAME=$(grep 'Arch' arch/build/base/initscripts/rc.sysinit | sed -e 's/printhl "//g' -e 's/$C_OTHER(${C_H2}//g' -e 's/\\n"//g' -e 's/$C_OTHER)//g')
|
NAME=$(grep 'Arch' arch/build/base/initscripts/rc.sysinit | sed -e 's/printhl "//g' -e 's/$C_OTHER(${C_H2}//g' -e 's/\\n"//g' -e 's/$C_OTHER)//g')
|
||||||
|
|
|
@ -89,9 +89,9 @@ install ()
|
||||||
# always needed for every install
|
# always needed for every install
|
||||||
cd ${ARCH_CVSTREE}
|
cd ${ARCH_CVSTREE}
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
||||||
export CVSROOT={$ARCH_CVSSETUP}
|
export CVSROOT=${ARCH_CVSSETUP}
|
||||||
cvs -z3 co arch/scripts/{km,setup,quickinst}
|
cvs -z3 co arch/scripts/{km,setup,quickinst}
|
||||||
cvs -z3 co arch/doc/en/guide/install/ARCH_install-guide.txt
|
cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
|
||||||
cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
|
cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
|
||||||
fi
|
fi
|
||||||
# fix km script
|
# fix km script
|
||||||
|
@ -119,7 +119,7 @@ install ()
|
||||||
fi
|
fi
|
||||||
DOCS=$(mktemp /tmp/docs.XXXX)
|
DOCS=$(mktemp /tmp/docs.XXXX)
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
||||||
cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${DOCS}
|
cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${DOCS}
|
||||||
else
|
else
|
||||||
cp -f ${DOCUMENTATION} ${DOCS}
|
cp -f ${DOCUMENTATION} ${DOCS}
|
||||||
fi
|
fi
|
||||||
|
@ -128,7 +128,7 @@ install ()
|
||||||
add_dir "/src"
|
add_dir "/src"
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
||||||
if ! [ "${TEMPDIR}" = "" ]; then
|
if ! [ "${TEMPDIR}" = "" ]; then
|
||||||
cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${TEMPDIR}/arch/archdoc.txt
|
cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
|
||||||
cd ${TEMPDIR}/arch/pkg/setup/
|
cd ${TEMPDIR}/arch/pkg/setup/
|
||||||
#wget ${FTPSERVER}/$(uname -m)/setup/pacman.pkg.tar.gz
|
#wget ${FTPSERVER}/$(uname -m)/setup/pacman.pkg.tar.gz
|
||||||
cd ${TEMPDIR}/core/pkg/
|
cd ${TEMPDIR}/core/pkg/
|
||||||
|
|
|
@ -30,9 +30,9 @@ install ()
|
||||||
# always needed for every install
|
# always needed for every install
|
||||||
cd ${ARCH_CVSTREE}
|
cd ${ARCH_CVSTREE}
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
||||||
export CVSROOT={ARCH_CVSSETUP}
|
export CVSROOT=${ARCH_CVSSETUP}
|
||||||
cvs -z3 co arch/scripts/{km,setup,quickinst}
|
cvs -z3 co arch/scripts/{km,setup,quickinst}
|
||||||
cvs -z3 co arch/doc/en/guide/install/ARCH_install-guide.txt
|
cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
|
||||||
cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
|
cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
|
||||||
fi
|
fi
|
||||||
# fix km script
|
# fix km script
|
||||||
|
@ -60,7 +60,7 @@ install ()
|
||||||
fi
|
fi
|
||||||
DOCS=$(mktemp /tmp/docs.XXXX)
|
DOCS=$(mktemp /tmp/docs.XXXX)
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
||||||
cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${DOCS}
|
cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${DOCS}
|
||||||
else
|
else
|
||||||
cp -f ${DOCUMENTATION} ${DOCS}
|
cp -f ${DOCUMENTATION} ${DOCS}
|
||||||
fi
|
fi
|
||||||
|
@ -68,7 +68,7 @@ install ()
|
||||||
add_file "${DOCS}.gz" "/arch/archdoc.txt.gz"
|
add_file "${DOCS}.gz" "/arch/archdoc.txt.gz"
|
||||||
add_dir "/src"
|
add_dir "/src"
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
||||||
! [ "${TEMPDIR}" = "" ] && cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${TEMPDIR}/arch/archdoc.txt
|
! [ "${TEMPDIR}" = "" ] && cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
|
||||||
else
|
else
|
||||||
! [ "${TEMPDIR}" = "" ] && cp -f ${DOCUMENTATION} ${TEMPDIR}/arch/archdoc.txt
|
! [ "${TEMPDIR}" = "" ] && cp -f ${DOCUMENTATION} ${TEMPDIR}/arch/archdoc.txt
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue