nrelease - fix/improve livecd

Make building a livecd image with "binpkgs" easier:

    make release gui binpkgs

now works out of the box without having to manually specify the
corresponding packages for some ports (e.g. perl5).

While there, fix .xinitrc (we no longer use pkgsrc) and use a more
recent xorg.conf.

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 7356d93..c21324f 100644 (file)
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -75,8 +75,9 @@ IMGFILE?=             ${ISODIR}/dfly-gui.img
 # NOTE: order important, do not sort package list
 #
 DPORTS_PACKAGES+=      x11/xorg \
+                       x11-drivers/xf86-input-libinput \
                        x11-wm/fluxbox \
-                       x11-wm/fvwm \
+                       x11-wm/fvwm3 \
                        www/firefox \
                        graphics/xpdf \
                        shells/zsh \
@@ -94,7 +95,16 @@ DPORTS_PACKAGES+=    x11/xorg \
                        x11-fonts/terminus-font \
                        net/rsync \
                        x11-clocks/asclock \
-                       sysutils/screen
+                       sysutils/screen \
+                       sysutils/tmux
+.endif
+
+.if make(binpkgs)
+PKG_x11-wm/fvwm3?=fvwm3
+PKG_lang/perl5?=perl5
+# Only install the console flavor of vim, whereas
+# "pkg ins editors/vim" would install all flavors.
+PKG_editors/vim?=vim
 .endif
 
 ROOTSKELS+=            ${.CURDIR}/gui

diff --git a/nrelease/gui/etc/X11/xorg.conf b/nrelease/gui/etc/X11/xorg.conf
index 2af34ca..37697c7 100644 (file)
--- a/nrelease/gui/etc/X11/xorg.conf
+++ b/nrelease/gui/etc/X11/xorg.conf
@@ -31,12 +31,12 @@ Section "InputDevice"
        Option      "XkbOptions" "ctrl:nocaps"
 EndSection
 
-Section "InputDevice"
-       Identifier  "Mouse0"
-       Driver      "mouse"
-       Option      "Protocol" "auto"
-       Option      "Device" "/dev/sysmouse"
-       Option      "ZAxisMapping" "4 5 6 7"
+Section "InputClass"
+       Identifier "libinput pointer catchall"
+       MatchIsPointer "on"
+       MatchIsTouchpad "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "libinput"
 EndSection
 
 Section "Monitor"

diff --git a/nrelease/gui/etc/rc.conf b/nrelease/gui/etc/rc.conf
index df0d603..4544959 100644 (file)
--- a/nrelease/gui/etc/rc.conf
+++ b/nrelease/gui/etc/rc.conf
@@ -13,4 +13,4 @@ nfs_client_enable="YES"
 nfs_server_enable="NO"
 rpc_umntall_enable="NO"
 cron_enable="NO"
-moused_enable="YES"
+moused_enable="NO"

diff --git a/nrelease/gui/root/.xinitrc b/nrelease/gui/root/.xinitrc
index d0001fe..6cbe503 100755 (executable)
--- a/nrelease/gui/root/.xinitrc
+++ b/nrelease/gui/root/.xinitrc
@@ -7,19 +7,9 @@ umask 022
 
 set userresources = "$HOME/.Xresources"
 set usermodmap = "$HOME/.Xmodmap"
-set sysresources = "/usr/pkg/xorg/lib/X11/xinit/.Xresources"
-set sysmodmap = "/usr/pkg/xorg/lib/X11/xinit/.Xmodmap"
 
 cd $HOME
 
-if ( -f $sysresources ) then
-    xrdb -merge $sysresources
-endif
-
-if ( -f $sysmodmap ) then
-    xmodmap $sysmodmap
-endif
-
 if ( -f $userresources ) then
     xrdb -merge $userresources
 endif
@@ -28,6 +18,8 @@ if ( -f $usermodmap ) then
     xmodmap $usermodmap
 endif
 
+xinput set-prop 'SynPS/2 Synaptics TouchPad' 'libinput Tapping Enabled' 1
+
 xset m 2 1
 (limit core 0; xscreensaver -nosplash) &
 asclock -shape -position -60+345 -led green -noblink &
@@ -37,7 +29,7 @@ setenv TERM xterm
 
 # start window manager here
 #
-/usr/pkg/bin/fvwm2 -f ~/.fvwm/.fvwm2rc
+/usr/local/bin/fvwm3 -f ~/.fvwm/.fvwm2rc
 #startkde
 
 /bin/kill $SSH_AGENT_PID