summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/profile/build.sh15
-rw-r--r--configs/profile/packages/packages-gui.all4
-rw-r--r--configs/profile/root-image/etc/motd2
-rw-r--r--configs/profile/root-image/etc/pacman.conf25
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh13
5 files changed, 14 insertions, 45 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index b016ca8..40b5404 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -17,6 +17,7 @@ iso_version=$(date +%Y.%m.%d)
iso_label="PARA_$(date +%Y%m)"
iso_dirname='parabola'
enable_offline_install='false'
+offline_switch=''
work_dir=./work
out_dir=./out
target=''
@@ -130,9 +131,6 @@ make_packages() {
[ "${_install_gui_packages}" ] && echo "Installing ${_gui_packages_msg}" && echo "${_install_gui_lists}" | sed "s/.*\//\t/"
[ "${_cache_gui_packages}" ] && echo "Caching ${_gui_packages_msg}" && echo "${_cache_gui_lists}" | sed "s/.*\//\t/"
-# FIXME: KLUDGE begin
-setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p 'boost-libs=1.65.1-2' install
-# FIXME: KLUDGE end
# install packages
setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_install_packages}" install
@@ -140,7 +138,7 @@ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf
if [[ "$enable_offline_install" == 'true' ]]; then
if [[ -n ${_cache_packages} ]]; then
# download any cache packages and prune obsolete packages
- cache_only='true' setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" -O install
+ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" ${offline_switch} cache
fi
# create 'isorepo' for offline install
pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null
@@ -186,7 +184,6 @@ make_setup_mkinitcpio() {
# Customize installation (root-image)
make_customize_root_image() {
- [[ "$enable_offline_install" == 'true' ]] && offline='-O' || offline=''
cp -af ${releng_dir}/root-image ${work_dir}/${arch}
@@ -199,7 +196,7 @@ make_customize_root_image() {
setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} \
-C ${pacman_conf} \
-D ${iso_dirname} \
- ${offline} \
+ ${offline_switch} \
-r /root/customize_root_image.sh \
run
rm ${work_dir}/${arch}/root-image/root/customize_root_image*
@@ -332,11 +329,9 @@ make_aitab() {
# Build all filesystem images specified in aitab (.fs.sfs .sfs)
make_prepare() {
- [[ "$enable_offline_install" == 'true' ]] && offline='-O' || offline=''
-
cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir}
setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} pkglist
- setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} ${offline} prepare
+ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} ${offline_switch} prepare
rm -rf ${work_dir}/root-image
# rm -rf ${work_dir}/${arch}/root-image (if low space, this helps)
@@ -359,7 +354,7 @@ while getopts 'E:T:V:L:D:OC:w:o:vh' arg; do
V) iso_version="${OPTARG}" ;;
L) iso_label="${OPTARG}" ;;
D) iso_dirname="${OPTARG}" ;;
- O) enable_offline_install='true' ;;
+ O) enable_offline_install='true' offline_switch='-O' ;;
C) pacman_conf="${OPTARG}" ;;
w) work_dir="${OPTARG}" ;;
o) out_dir="${OPTARG}" ;;
diff --git a/configs/profile/packages/packages-gui.all b/configs/profile/packages/packages-gui.all
index 777e9e6..7231c04 100644
--- a/configs/profile/packages/packages-gui.all
+++ b/configs/profile/packages/packages-gui.all
@@ -45,7 +45,7 @@ octopi-notifier
octopi-repoeditor
pidgin
qtox
-ring-client-gnome
+ring-gnome
smplayer
@@ -63,7 +63,7 @@ wbar
# Xserver
ttf-dejavu
+xf86-video-sisusb
xorg-drivers
xorg-server
-xf86-video-sisusb
xorg-xinit
diff --git a/configs/profile/root-image/etc/motd b/configs/profile/root-image/etc/motd
index 02d05ef..67330df 100644
--- a/configs/profile/root-image/etc/motd
+++ b/configs/profile/root-image/etc/motd
@@ -7,7 +7,7 @@
 #### |_| \__,_|_| \___,_|_,__/ \___/|_|\__,_| libre
 ###
 ###
- ## Free as in freedom
+ ## Free as in Freedom
 #
========================================================================
diff --git a/configs/profile/root-image/etc/pacman.conf b/configs/profile/root-image/etc/pacman.conf
deleted file mode 100644
index d77556f..0000000
--- a/configs/profile/root-image/etc/pacman.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[options]
-HoldPkg = pacman glibc
-Architecture = auto
-CheckSpace
-SigLevel = Required DatabaseOptional
-LocalFileSigLevel = Optional
-
-[libre]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-[pcr]
-Include = /etc/pacman.d/mirrorlist
-
-[pcr-testing]
-Include = /etc/pacman.d/mirrorlist
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 0cd7c9e..13a606b 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -18,14 +18,14 @@ chmod 440 /etc/sudoers.d/g_wheel
# configure pacman
sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist
# KLUDGE begin # FIXME: https://labs.parabola.nu/issues/1527
-if [[ "${arch}" == "i686" ]]
-then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
-fi
-echo "Server = https://parabola.isacdaavid.info:8081/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+# if [[ "${arch}" == "i686" ]]
+# then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+# fi
+# echo "Server = https://parabola.isacdaavid.info:8081/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
# KLUDGE end
-# KLUDGE begin temp until next calamares rebuild # FIXME:
+# KLUDGE begin - temp until next calamares rebuild # FIXME:
# cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf
-sed -i 's|requiredStorage:.*|requiredStorage: 8.9|' /usr/share/calamares/modules/welcome.conf
+# sed -i 's|requiredStorage:.*|requiredStorage: 8.9|' /usr/share/calamares/modules/welcome.conf
# KLUDGE end
# configure services
@@ -75,7 +75,6 @@ else # configure GUI login session and live user
fi
# configure desktop environment
-sed -i "s|.*octopi-notifier.*||" /home/${LIVE_USER}/.config/autostart/autostart-lxde.sh
sed -i "s|_EDITION_TITLE_|${PRETTY_NAME}|" /home/${LIVE_USER}/.config/autostart/autostart.sh
sed -i "s|,Don't show this again:0||" /home/${LIVE_USER}/.config/autostart/autostart.sh
sed -i "s|620x460|620x520|" /home/${LIVE_USER}/.config/autostart/autostart.sh