parent
789109bc18
commit
512ed7d586
3 changed files with 10 additions and 62 deletions
|
@ -195,13 +195,11 @@ ideally no xorg
|
|||
######* Packages-Custom/desktop
|
||||
Contains the custom image packages
|
||||
desktop environment packages go here
|
||||
this file is joind at build time with shared/Packages-Custom to pull in shared desktop packages
|
||||
|
||||
######* Packages-Xorg
|
||||
Contains the Xorg package repo
|
||||
|
||||
######* Packages-Lng
|
||||
Contains the language packages repo
|
||||
|
||||
######* Packages-Livecd
|
||||
Contains packages you only want on livecd but not installed on the target system with installer
|
||||
default files are in shared folder and can be symlinked or defined in a real file
|
||||
|
|
|
@ -258,10 +258,6 @@ write_isomounts(){
|
|||
echo '' >> $1
|
||||
msg2 "Writing livecd entry ..."
|
||||
echo "${arch}/livecd-image.sqfs ${arch} / squashfs" >> $1
|
||||
if [[ -f Packages-Lng ]] ; then
|
||||
msg2 "Writing lng entry ..."
|
||||
echo "${arch}/lng-image.sqfs ${arch} / squashfs" >> $1
|
||||
fi
|
||||
if [[ -f Packages-Xorg ]] ; then
|
||||
msg2 "Writing pkgs entry ..."
|
||||
echo "${arch}/pkgs-image.sqfs ${arch} / squashfs" >> $1
|
||||
|
|
|
@ -311,40 +311,6 @@ make_image_xorg() {
|
|||
fi
|
||||
}
|
||||
|
||||
make_image_lng() {
|
||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||
msg "Prepare [lng-image]"
|
||||
local path="${work_dir}/lng-image"
|
||||
mkdir -p ${path}/opt/livecd/lng
|
||||
umount_image_handler
|
||||
if [[ -n "${custom}" ]] ; then
|
||||
aufs_mount_custom_image "${path}"
|
||||
aufs_append_root_image "${path}"
|
||||
else
|
||||
aufs_mount_root_image "${path}"
|
||||
fi
|
||||
if [[ -n ${packages_lng_kde} ]]; then
|
||||
download_to_cache "${path}" "${packages} ${packages_lng_kde}"
|
||||
copy_cache_lng
|
||||
else
|
||||
download_to_cache "${path}" "${packages}"
|
||||
copy_cache_lng
|
||||
fi
|
||||
if [[ -n "${packages_cleanup}" ]]; then
|
||||
for lng_clean in ${packages_cleanup}; do
|
||||
rm ${path}/opt/livecd/lng/${lng_clean}
|
||||
done
|
||||
fi
|
||||
cp ${PKGDATADIR}/pacman-lng.conf ${path}/opt/livecd
|
||||
rm -r ${path}/var
|
||||
make_repo ${path}/opt/livecd/lng/lng-pkgs ${path}/opt/livecd/lng
|
||||
umount_image_handler
|
||||
aufs_clean "${path}"
|
||||
: > ${work_dir}/build.${FUNCNAME}
|
||||
msg "Done [lng-image]"
|
||||
fi
|
||||
}
|
||||
|
||||
make_image_boot() {
|
||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||
msg "Prepare [${iso_name}/boot]"
|
||||
|
@ -552,21 +518,13 @@ load_pkgs(){
|
|||
| sed "$_clean")
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
'Packages-Xorg')
|
||||
if [[ $1 == 'Packages-Xorg' ]]; then
|
||||
packages_cleanup=$(sed "$_com_rm" "$1" \
|
||||
| grep cleanup \
|
||||
| sed "$_purge_rm" \
|
||||
| sed "$_kernel" \
|
||||
| sed "$_clean")
|
||||
;;
|
||||
'Packages-Lng')
|
||||
packages_cleanup=$(sed "$_com_rm" "$1" \
|
||||
| grep cleanup \
|
||||
| sed "$_purge_rm")
|
||||
packages_lng_kde=$(sed "$_com_rm" "$1" | sed "$_clean")
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
check_plymouth(){
|
||||
|
@ -610,7 +568,7 @@ load_profile(){
|
|||
local files=$(ls Packages*)
|
||||
for f in ${files[@]};do
|
||||
case $f in
|
||||
Packages|Packages-Livecd|Packages-Xorg|Packages-Lng) continue ;;
|
||||
Packages|Packages-Livecd|Packages-Xorg) continue ;;
|
||||
*) packages_custom="$f" ;;
|
||||
esac
|
||||
done
|
||||
|
@ -651,10 +609,6 @@ build_images(){
|
|||
load_pkgs 'Packages-Xorg'
|
||||
make_image_xorg
|
||||
fi
|
||||
if [[ -f Packages-Lng ]] ; then
|
||||
load_pkgs 'Packages-Lng'
|
||||
make_image_lng
|
||||
fi
|
||||
make_image_boot
|
||||
if [[ "${arch}" == "x86_64" ]]; then
|
||||
make_efi
|
||||
|
|
Loading…
Reference in a new issue