diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile index 68fd0f749..eaa1c843a 100644 --- a/XOrg/app/fluxbox/Makefile +++ b/XOrg/app/fluxbox/Makefile @@ -45,7 +45,13 @@ endef define Package/fbsetroot $(call Package/fluxbox/Default) DEPENDS:=fluxbox - TITLE:=set fluxbox background + TITLE:=set fluxbox background colors +endef + +define Package/fbsetbg +$(call Package/fluxbox/Default) + DEPENDS:=fluxbox +x-bkgd-images +eterm + TITLE:=set fluxbox background images endef define Build/Configure @@ -68,12 +74,17 @@ endef define Package/fluxbox/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/{fluxbox,fbsetbg} $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/{init,keys} $(1)/usr/share/fluxbox/ $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/ $(CP) files/menu $(1)/usr/share/fluxbox/ endef +define Package/fbsetbg/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/ +endef + define Package/fbsetroot/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/ @@ -85,5 +96,6 @@ define Package/fbrun/install endef $(eval $(call BuildPackage,fbrun)) +$(eval $(call BuildPackage,fbsetbg)) $(eval $(call BuildPackage,fbsetroot)) $(eval $(call BuildPackage,fluxbox)) diff --git a/XOrg/meta/xorg-server-essentials/files/xinitrc b/XOrg/meta/xorg-server-essentials/files/xinitrc index bb0a0e96e..6d7ff3a3a 100644 --- a/XOrg/meta/xorg-server-essentials/files/xinitrc +++ b/XOrg/meta/xorg-server-essentials/files/xinitrc @@ -1 +1,5 @@ +BKGD_IMAGE_PATH=/usr/share/X11/bkgd-images/ +if [ -x `which fbsetbg` ]; then + fbsetbg -f ${BKGD_IMAGE_PATH}/default.png +fi fluxbox