teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vanilla-mklive: new pkg, replaces xbps-mklive. Bump to 0.4.0.

Browse Source
This commit is contained in:
Juan RP 2011-06-25 11:23:56 +02:00
parent 01ae5d4d1a
commit a18463c177
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
srcpkgs/xbps-mklive/files/xbps-mklive.sh.in → srcpkgs/vanilla-mklive/files/mklive.sh.in
View File

@ -53,10 +53,10 @@ write_etc_motd()
{
cat >> "$ROOTFS/etc/motd" <<_EOF
###############################################################################
Autogenerated by xbps-mklive @@MKLIVE_VERSION@@.
Autogenerated by vanilla-mklive @@MKLIVE_VERSION@@.
-------------------------------------------------------------------------------
Welcome to the XBPS GNU/Linux Live system, you have been autologged in.
Welcome to the Vanilla GNU/Linux Live system, you have been autologged in.
This user has full sudo(8) permissions without any password, be careful
executing commands through sudo(8).
@ -106,13 +106,13 @@ MENU COLOR border * #00000000 #00000000 none
MENU COLOR sel * #ffffffff #FF5255FF *
LABEL linux
MENU LABEL Boot XBPS GNU/Linux ${kver} ($(uname -m))
MENU LABEL Boot Vanilla GNU/Linux ${kver} ($(uname -m))
KERNEL /casper/vmlinuz
INITRD /casper/initrd.lz
APPEND boot=casper keymap=${KEYMAP:-es} locale=${LOCALE:-es_ES} ro
LABEL linuxtoram
MENU LABEL Boot XBPS GNU/Linux ${kver} (toram) ($(uname -m))
MENU LABEL Boot Vanilla GNU/Linux ${kver} (toram) ($(uname -m))
KERNEL /casper/vmlinuz
INITRD /casper/initrd.lz
APPEND boot=casper toram keymap=${KEYMAP:-es} locale=${LOCALE:-es_ES} ro
@ -159,14 +159,14 @@ if [ "$(id -u)" -ne 0 ]; then
exit 1
fi
CONFIG_DIR="$HOME/.xbps-mklive"
CONFIG_DIR="$HOME/.mklive"
CONFIG_FILE="$CONFIG_DIR/default.conf"
if [ -z "$OUTPUT_FILE" ]; then
OUTPUT_FILE="$HOME/xbps-live-$(uname -m)-$(date +%Y%m%d).iso"
OUTPUT_FILE="$HOME/vanilla-live-$(uname -m)-$(date +%Y%m%d).iso"
fi
if [ -z "$ISO_VOLUME" ]; then
ISO_VOLUME="XBPS GNU/Linux Live $(uname -m)"
ISO_VOLUME="Vanilla GNU/Linux Live $(uname -m)"
fi
#
@ -211,10 +211,13 @@ if [ -z "$ROOTDIR" ]; then
#
# Register all package repositories in the target rootfs.
#
for _repo_ in ${PACKAGE_REPO}; do
info_msg "Adding ${_repo_} package repository..."
${XBPS_REPO_CMD} -r "$ROOTFS" add "${_repo_}" || error_out $?
done
xver=$(${XBPS_BIN_CMD} -V|awk '{print $2}')
if [ -z "$xver" -o "$xver" = "" ]; then
for _repo_ in ${PACKAGE_REPO}; do
info_msg "Adding ${_repo_} package repository..."
${XBPS_REPO_CMD} -r "$ROOTFS" add "${_repo_}" || error_out $?
done
fi
${XBPS_BIN_CMD} -r "$ROOTFS" -y install ${PACKAGE_LIST} || error_out $?
${XBPS_BIN_CMD} -r "$ROOTFS" -y autoupdate || error_out $?
${XBPS_BIN_CMD} -r "$ROOTFS" -yp autoremove || error_out $?

13
srcpkgs/xbps-mklive/template → srcpkgs/vanilla-mklive/template
View File

@ -1,14 +1,15 @@
# Template file for 'xbps-mklive'
pkgname=xbps-mklive
version=0.3.7
# Template file for 'vanilla-mklive'
pkgname=vanilla-mklive
version=0.4.0
build_style=custom-install
short_desc="XBPS Live image maker"
short_desc="Vanilla GNU/Linux live image maker"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=b31983b27630b3ef99f68bd8382851a7963542c944b625bdbfd2f2ff301a02d3
long_desc="
$pkgname is a simple shell script to build a bootable live image,
with xbps binary packages."
replaces="xbps-mklive>=0"
noextract=yes
noarch=yes
Add_dependency full cdrtools
@ -19,10 +20,10 @@ Add_dependency full initramfs-tools
do_build()
{
sed "s|@@MKLIVE_VERSION@@|${version}|g" \
${FILESDIR}/${pkgname}.sh.in > ${pkgname}.sh
${FILESDIR}/mklive.sh.in > ${pkgname}.sh
}
do_install()
{
install -Dm755 ${pkgname}.sh ${DESTDIR}/usr/sbin/xbps-mklive
install -Dm755 ${pkgname}.sh ${DESTDIR}/usr/sbin/vanilla-mklive
}