Skip to contentSkip to conversation

fluxbox: add xsession profile

PATCH New yegorslists at googlemail.com 3 participants 9 messages Oct 10, 2011 – Dec 7, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 fluxbox: add xsession profile

From: Yegor Yefremov <[email protected]>

add .xsession profile to get fluxbox being started automatically by XDM

---
 package/fluxbox/.xsession  |    1 +
 package/fluxbox/fluxbox.mk |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 package/fluxbox/.xsession
package/fluxbox/.xsession new file +1 -0
new file mode 100644
index 0000000..3775bad
@@ -0,0 +1 @@
+exec startfluxbox
package/fluxbox/fluxbox.mk +6 -0
index 85a8eae..e0f6e4e 100644
@@ -13,4 +13,10 @@ FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 
 FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
+define FLUXBOX_INSTALL_XSESSION_FILE
+	$(INSTALL) -m 0644 package/fluxbox/.xsession $(TARGET_DIR)/root/.xsession
+endef
+
+FLUXBOX_POST_INSTALL_TARGET_HOOKS += FLUXBOX_INSTALL_XSESSION_FILE
+
 $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.1.1
#1 lore raw

PATCH 2/3 xdm: bump to 1.1.11

From: Yegor Yefremov <[email protected]>

---
 package/x11r7/xapp_xdm/xapp_xdm.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
package/x11r7/xapp_xdm/xapp_xdm.mk +2 -1
index 4dc0d02..81e2acd 100644
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-XAPP_XDM_VERSION = 1.1.6
+XAPP_XDM_VERSION = 1.1.11
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx --with-wtmp-file=/var/adm/wtmpx
 
 $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.1.1
#2 lore raw

PATCH 2/3 xdm: bump to 1.1.11

Am 10.10.2011 11:21, schrieb yegorslists at googlemail.com:

Quoted 14 lines

From: Yegor Yefremov <[email protected]>

---
 package/x11r7/xapp_xdm/xapp_xdm.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
package/x11r7/xapp_xdm/xapp_xdm.mk +0 -0
index 4dc0d02..81e2acd 100644
@@ -4,10 +4,11 @@
 #
 ################################################################################

package/x11r7/xapp_xdm/xapp_xdm.mk line 14

Quoted 10 lines
package/x11r7/xapp_xdm/xapp_xdm.mk +2 -1
 
-XAPP_XDM_VERSION = 1.1.6
+XAPP_XDM_VERSION = 1.1.11
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx --with-wtmp-file=/var/adm/wtmpx
 
 $(eval $(call AUTOTARGETS))

ping?

#4 lore raw

PATCH 3/3 xdm: install startup script

In reply to yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

install S99xdm to /etc/init.d to start XDM automatically

---
 package/x11r7/xapp_xdm/S99xdm      |   27 +++++++++++++++++++++++++++
 package/x11r7/xapp_xdm/xapp_xdm.mk |    6 ++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 package/x11r7/xapp_xdm/S99xdm
package/x11r7/xapp_xdm/S99xdm new file +27 -0
new file mode 100644
index 0000000..57b5d92
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+XDM_BIN=/usr/bin/xdm
+
+case "$1" in
+    start)
+        echo -n "Starting XDM: "
+        $XDM_BIN
+        echo "done"
+        ;;
+    stop)
+	echo "Stopping XDM"
+        killall -q xdm
+        ;;
+    restart)
+        /etc/init.d/S99xdm stop
+        /etc/init.d/S99xdm start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+
+exit 0
+
package/x11r7/xapp_xdm/xapp_xdm.mk +6 -0
index 81e2acd..d0fc2fc 100644
@@ -11,4 +11,10 @@ XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
 XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx --with-wtmp-file=/var/adm/wtmpx
 
+define XAPP_XDM_INSTALL_STARTUP_SCRIPT
+	$(INSTALL) -m 0755 package/x11r7/xapp_xdm/S99xdm $(TARGET_DIR)/etc/init.d/S99xdm
+endef
+
+XAPP_XDM_POST_INSTALL_TARGET_HOOKS += XAPP_XDM_INSTALL_STARTUP_SCRIPT
+
 $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.1.1
#5 lore raw

PATCH 3/3 xdm: install startup script

Am 10.10.2011 11:22, schrieb yegorslists at googlemail.com:

Quoted 49 lines

From: Yegor Yefremov <[email protected]>

install S99xdm to /etc/init.d to start XDM automatically

---
 package/x11r7/xapp_xdm/S99xdm      |   27 +++++++++++++++++++++++++++
 package/x11r7/xapp_xdm/xapp_xdm.mk |    6 ++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 package/x11r7/xapp_xdm/S99xdm
package/x11r7/xapp_xdm/S99xdm new file +27 -0
new file mode 100644
index 0000000..57b5d92
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+XDM_BIN=/usr/bin/xdm
+
+case "$1" in
+    start)
+        echo -n "Starting XDM: "
+        $XDM_BIN
+        echo "done"
+        ;;
+    stop)
+	echo "Stopping XDM"
+        killall -q xdm
+        ;;
+    restart)
+        /etc/init.d/S99xdm stop
+        /etc/init.d/S99xdm start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+
+exit 0
+
package/x11r7/xapp_xdm/xapp_xdm.mk +0 -0
index 81e2acd..d0fc2fc 100644

package/x11r7/xapp_xdm/xapp_xdm.mk XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes · line 20

Quoted 10 lines
package/x11r7/xapp_xdm/xapp_xdm.mk +6 -0
@@ -11,4 +11,10 @@ XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
 XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx --with-wtmp-file=/var/adm/wtmpx
 
+define XAPP_XDM_INSTALL_STARTUP_SCRIPT
+	$(INSTALL) -m 0755 package/x11r7/xapp_xdm/S99xdm $(TARGET_DIR)/etc/init.d/S99xdm
+endef
+
+XAPP_XDM_POST_INSTALL_TARGET_HOOKS += XAPP_XDM_INSTALL_STARTUP_SCRIPT
+
 $(eval $(call AUTOTARGETS))

ping?

#6 lore raw

PATCH 3/3 xdm: install startup script

In reply to yegorslists at googlemail.com
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"yegorslists" == yegorslists <[email protected]> writes:

yegorslists> From: Yegor Yefremov <[email protected]> yegorslists> install S99xdm to /etc/init.d to start XDM automatically

Committed with small fixes, thanks.

yegorslists> +define XAPP_XDM_INSTALL_STARTUP_SCRIPT
yegorslists> + $(INSTALL) -m 0755 package/x11r7/xapp_xdm/S99xdm $(TARGET_DIR)/etc/init.d/S99xdm

Remember to use install -D to ensure destination dir exists.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/3 fluxbox: add xsession profile

In reply to yegorslists at googlemail.com

Am 10.10.2011 11:21, schrieb yegorslists at googlemail.com:

Quoted 24 lines

From: Yegor Yefremov <[email protected]>

add .xsession profile to get fluxbox being started automatically by XDM

---
 package/fluxbox/.xsession  |    1 +
 package/fluxbox/fluxbox.mk |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 package/fluxbox/.xsession
package/fluxbox/.xsession new file +1 -0
new file mode 100644
index 0000000..3775bad
@@ -0,0 +1 @@
+exec startfluxbox
package/fluxbox/fluxbox.mk +0 -0
index 85a8eae..e0f6e4e 100644

package/fluxbox/fluxbox.mk FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ · line 22

Quoted 10 lines
package/fluxbox/fluxbox.mk +6 -0
@@ -13,4 +13,10 @@ FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 
 FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
+define FLUXBOX_INSTALL_XSESSION_FILE
+	$(INSTALL) -m 0644 package/fluxbox/.xsession $(TARGET_DIR)/root/.xsession
+endef
+
+FLUXBOX_POST_INSTALL_TARGET_HOOKS += FLUXBOX_INSTALL_XSESSION_FILE
+
 $(eval $(call AUTOTARGETS))

ping?

#8 lore raw

PATCH 1/3 fluxbox: add xsession profile

In reply to yegorslists at googlemail.com
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"yegorslists" == yegorslists <[email protected]> writes:

yegorslists> From: Yegor Yefremov <[email protected]> yegorslists> add .xsession profile to get fluxbox being started automatically yegorslists> by XDM

Committed with some fixes, thanks.

yegorslists> Signed-off-by: Yegor Yefremov <[email protected]> yegorslists> ---

 yegorslists>  package/fluxbox/.xsession  |    1 +
 yegorslists>  package/fluxbox/fluxbox.mk |    6 ++++++

yegorslists> 2 files changed, 7 insertions(+), 0 deletions(-) yegorslists> create mode 100644 package/fluxbox/.xsession

yegorslists> diff --git a/package/fluxbox/.xsession b/package/fluxbox/.xsession yegorslists> new file mode 100644
yegorslists> index 0000000..3775bad
yegorslists> --- /dev/null
yegorslists> +++ b/package/fluxbox/.xsession

I prefer to call it xsession, so it isn't hidden.

yegorslists> @@ -0,0 +1 @@
yegorslists> +exec startfluxbox

.xsession scripts afaik should be executable shell scripts.

yegorslists> diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk yegorslists> index 85a8eae..e0f6e4e 100644
yegorslists> --- a/package/fluxbox/fluxbox.mk
yegorslists> +++ b/package/fluxbox/fluxbox.mk
yegorslists> @@ -13,4 +13,10 @@ FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \

yegorslists> FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)

yegorslists> +define FLUXBOX_INSTALL_XSESSION_FILE
yegorslists> + $(INSTALL) -m 0644 package/fluxbox/.xsession $(TARGET_DIR)/root/.xsession

We should only install this if it isn't available in the fs skeleton, so you can provide a custom version. Also use 0755 permissions so it becomes executable and lastly use install -D so it doesn't fail if skeleton doesn't have /root/.

Signature · 1 line
Bye, Peter Korsgaard