root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[basestrap] revert the branch experiments

Browse source
This commit is contained in:
udeved 2015-06-01 01:05:04 +02:00
parent ff3f598f0a
commit dfefe9c856
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/basestrap.in
View file

@ -50,10 +50,11 @@ usage() {
orig_argv=("$@")
while getopts ':C:cdGiM' flag; do
opts=':C:cdGiM'
while getopts ${opts} flag; do
case ${arg} in
C) pacman_config=$OPTARG ;;
b) branch=$OPTARG ;;
d) directory=true ;;
c) hostcache=true ;;
i) interactive=true ;;
@ -106,9 +107,9 @@ fi
if ${copymirrorlist}; then
# install the host's mirrorlist onto the new root
#cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
cp -a ${PKGDATADIR}/pacman-mirrors-${branch}.conf "$newroot/etc" #/pacman.d/"
pacman-mirrors -g -b ${branch}
cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
#cp -a ${PKGDATADIR}/pacman-mirrors-${branch}.conf "$newroot/etc" #/pacman.d/"
#pacman-mirrors -g -b ${branch}
fi
# vim: et ts=2 sw=2 ft=sh:

2
bin/buildpkg.in
View file

@ -163,7 +163,7 @@ pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
makepkg_conf="${PKGDATADIR}/makepkg-${arch}.conf"
mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
mkchroot_args+=(-b ${branch} -C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}")
mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}")
mkchrootpkg_args+=(-r ${work_dir})

5
bin/mkchroot.in
View file

@ -33,7 +33,7 @@ usage() {
orig_argv=("$@")
opts='hLC:M:S:c:b:B:'
opts='hLC:M:S:c:B:'
while getopts ${opts} arg; do
case "${arg}" in
@ -41,7 +41,6 @@ while getopts ${opts} arg; do
M) makepkg_conf="$OPTARG" ;;
S) mirrors_conf="$OPTARG" ;;
c) cache_dir="$OPTARG" ;;
b) branch="$OPTARG" ;;
L) build_locales=true ;;
B) build_mirror="$OPTARG" ;;
h|?) usage ;;
@ -83,7 +82,7 @@ if [[ $(stat -f -c %T "$working_dir") == btrfs ]]; then
chmod 0755 "$working_dir"
fi
basestrap ${branch:+-b ${branch}} -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
echo "$version" > "$working_dir/.manjaro-tools"