mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
add grub2 and change to any compression
This commit is contained in:
parent
dabb067f46
commit
fde86ff8a3
1 changed files with 12 additions and 7 deletions
|
@ -72,15 +72,15 @@ install ()
|
||||||
. "${COPY}/PKGBUILD"
|
. "${COPY}/PKGBUILD"
|
||||||
if [ "$(echo ${arch} | grep 'any')" ]; then
|
if [ "$(echo ${arch} | grep 'any')" ]; then
|
||||||
for i in ${pkgname[@]}; do
|
for i in ${pkgname[@]}; do
|
||||||
cp /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-any.pkg.tar.gz ${TEMPDIR}/core-any/pkg/
|
cp /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-any.pkg.tar.* ${TEMPDIR}/core-any/pkg/
|
||||||
echo "$(echo ${COPY}| awk -F/ '{print $2}')/${i}-${pkgver}-${pkgrel}-any.pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
echo "$(echo ${COPY}| awk -F/ '{print $2}')/${i}-${pkgver}-${pkgrel}-any.pkg.tar.*" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
||||||
repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-any.pkg.tar.gz || return 1
|
repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-any.pkg.tar.* || return 1
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
for i in ${pkgname[@]}; do
|
for i in ${pkgname[@]}; do
|
||||||
cp /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz ${TEMPDIR}/core-$(uname -m)/pkg/
|
cp /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.* ${TEMPDIR}/core-$(uname -m)/pkg/
|
||||||
echo "$(echo ${COPY}| awk -F/ '{print $2}')/${i}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
echo "$(echo ${COPY}| awk -F/ '{print $2}')/${i}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.*" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
||||||
repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz || return 1
|
repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${i}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.* || return 1
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
unset pkgname
|
unset pkgname
|
||||||
|
@ -91,6 +91,11 @@ install ()
|
||||||
sed -i -e 's#base/udev-compat#support/udev-compat#g' ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
sed -i -e 's#base/udev-compat#support/udev-compat#g' ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
||||||
# generate packages.txt
|
# generate packages.txt
|
||||||
sort -u ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt -o ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
sort -u ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt -o ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt
|
||||||
|
### HACK add grub2 package to image
|
||||||
|
mkdir -p ${TEMPDIR}/grub2
|
||||||
|
pacman -Sw --noconfirm grub2
|
||||||
|
grub2ver="$(pacman -Si grub2 | grep Version | cut -d ":" -f 2)"
|
||||||
|
cp /var/cache/pacman/pkg/grub2-${grub2ver}-$(uname -m).pkg.tar.* ${TEMPDIR}/grub2
|
||||||
# generate iso title name
|
# generate iso title name
|
||||||
[ "${RUNPROGRAM}" = "mkisolinux" ] && echo "Arch_Linux_CORE $(uname -m)" >> ${ISONAME}
|
[ "${RUNPROGRAM}" = "mkisolinux" ] && echo "Arch_Linux_CORE $(uname -m)" >> ${ISONAME}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue