From 44f951959faf8a09ff60cda4024bccd9efd633a1 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 17:02:15 +0200 Subject: openbox --- .../modules/openbox/data/etc/xdg/openbox/menu.xml | 29 ++++++++++++++++++++++ remote/modules/openbox/openbox.build | 18 ++++++++++++++ remote/modules/openbox/openbox.conf | 12 +++++++++ 3 files changed, 59 insertions(+) create mode 100644 remote/modules/openbox/data/etc/xdg/openbox/menu.xml create mode 100644 remote/modules/openbox/openbox.build create mode 100644 remote/modules/openbox/openbox.conf (limited to 'remote/modules') diff --git a/remote/modules/openbox/data/etc/xdg/openbox/menu.xml b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml new file mode 100644 index 00000000..b53d6ae6 --- /dev/null +++ b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml @@ -0,0 +1,29 @@ + + + + + + + xterm + + + vmchooser -c /etc/openslx/vmchooser/vmchooser.conf + + + + + + + + + + + + + + + + diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build new file mode 100644 index 00000000..3e56fbfb --- /dev/null +++ b/remote/modules/openbox/openbox.build @@ -0,0 +1,18 @@ +fetch_source() { + : +} + +build() { + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" + + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" + + return 0 +} + +post_copy() { + [ ! -d "$TARGET_BUILD_DIR/etc/pango" ] && mkdir -p "$TARGET_BUILD_DIR/etc/pango" + pango-querymodules > "$TARGET_BUILD_DIR/etc/pango/pango.modules" +} diff --git a/remote/modules/openbox/openbox.conf b/remote/modules/openbox/openbox.conf new file mode 100644 index 00000000..67c63c4c --- /dev/null +++ b/remote/modules/openbox/openbox.conf @@ -0,0 +1,12 @@ +REQUIRED_DEPENDENCIES=" openbox + libpango1.0-0" +REQUIRED_PACKAGES=" openbox + libpango1.0-0" +REQUIRED_BINARIES=" openbox + openbox-session" +REQUIRED_FILES=" /usr/share/xsessions/openbox.desktop" +REQUIRED_DIRECTORIES=" /etc + /usr/lib/openbox + /usr/share/themes/Clearlooks + /usr/lib/$ARCH_TRIPLET/pango/" + -- cgit v1.2.3-55-g7522 From c0384330ba8b5c4790bf2cd89dd39f884b8523ce Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 14 May 2013 17:05:11 +0200 Subject: [vmplayer] +x on /usr/bin/* [rootfs-stage32] add user demo:demo --- remote/modules/vmplayer/vmplayer.build | 1 + remote/rootfs/rootfs-stage32/rootfs-stage32.build | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 6c3ae602..07c55c6d 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -26,6 +26,7 @@ build() { cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx." [ ! -L "$TARGET/bin/vmplayer" ] && { ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."; } chmod +x "$TARGET"/bin/* + chmod +x "$MODULE_BUILD_DIR"/usr/bin/* pinfo "Patching LIBCONF_DIR" local file="" for file in $(grep -rl "@@LIBCONF_DIR@@" "$MODULE_BUILD_DIR"); do diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 2e214c5d..bbd88a7e 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -90,8 +90,11 @@ post_copy() { # setup root accoun USER=root PASSWORD='!r00t' add_user + DEMO_ID="$(USER=demo PASSWORD=demo USERHOME=/home/demo USERSHELL=/bin/bash add_user)" - mkdir -p ${TARGET_BUILD_DIR}/root + mkdir -p "${TARGET_BUILD_DIR}/root" + mkdir -p "${TARGET_BUILD_DIR}/home/demo" + chown "$DEMO_ID:$DEMO_ID" "${TARGET_BUILD_DIR}/home/demo" echo "minilinux-$(hostname)" > "${TARGET_BUILD_DIR}/etc/hostname" # check for kernel modules, if not present copy from system -- cgit v1.2.3-55-g7522 From 3cd0adfa2a95a3a33c7e03a297466deb08a51e0e Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Tue, 14 May 2013 17:20:27 +0200 Subject: vmware fixes --- remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 2 +- remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'remote/modules') diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include index 65db53da..bc93d68b 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -421,7 +421,7 @@ esac # check if ide/scsi and hwver of image # read only the first 30 lines to be shure -imghead=$(head -30 ${diskfile}) +imghead=$(head -n 30 ${diskfile}) hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" |\ awk -F '"' '{print $2}') hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" |\ diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index a34634ab..a8bbf386 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -27,7 +27,8 @@ REQUIRED_BINARIES=" bash xterm ckbcomp xvidtune - bc" + bc + dirname" REQUIRED_LIBRARIES=" libcap libcidn libcom_err -- cgit v1.2.3-55-g7522 From 88a82657801e5f590e8eb326bf67b6070370a877 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 14 May 2013 17:30:38 +0200 Subject: DERP --- remote/modules/vmplayer/vmplayer.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 338a6958..0787d728 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -29,7 +29,7 @@ build() { cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx." [ ! -L "$TARGET/bin/vmplayer" ] && { ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."; } chmod +x "$TARGET"/bin/* - chmod +x "$MODULE_BUILD_DIR"/usr/bin/* + chmod +x "$MODULE_BUILD_DIR"/usr/{bin,sbin}/* pinfo "Patching LIBCONF_DIR" local file="" for file in $(grep -rl "@@LIBCONF_DIR@@" "$MODULE_BUILD_DIR"); do -- cgit v1.2.3-55-g7522 From 6276673bd50b50827dc4181a1a66612bf21ceff6 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 17:30:51 +0200 Subject: vmware service fix? --- .../data/etc/systemd/system/graphical.target.wants/vmware.service | 1 + remote/modules/vmplayer/data/etc/systemd/system/vmware.service | 1 + 2 files changed, 2 insertions(+) create mode 120000 remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service (limited to 'remote/modules') diff --git a/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service new file mode 120000 index 00000000..7deb4820 --- /dev/null +++ b/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service @@ -0,0 +1 @@ +../vmware.service \ No newline at end of file diff --git a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service index 067b15a0..df5331e0 100644 --- a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service +++ b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service @@ -1,6 +1,7 @@ [Unit] Description=Sets up the vmware environment Wants=graphical.target +Before=graphical.target [Service] Type=simple -- cgit v1.2.3-55-g7522 From 421c964d3de2ba45a2d650b0cc1eefc6d96ca6a5 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 17:41:13 +0200 Subject: lame menu entries :( --- remote/modules/openbox/data/etc/xdg/openbox/menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/openbox/data/etc/xdg/openbox/menu.xml b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml index b53d6ae6..866969f6 100644 --- a/remote/modules/openbox/data/etc/xdg/openbox/menu.xml +++ b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml @@ -6,7 +6,7 @@ file:///usr/share/openbox/menu.xsd"> - + xterm -- cgit v1.2.3-55-g7522 From ab82a3b0917fe69e10e2371d48b7a474d3bb3f93 Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Tue, 14 May 2013 17:48:42 +0200 Subject: make .sh executalble in vmware/lib --- remote/modules/vmplayer/vmplayer.build | 1 + 1 file changed, 1 insertion(+) (limited to 'remote/modules') diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 0787d728..27cf5372 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -30,6 +30,7 @@ build() { [ ! -L "$TARGET/bin/vmplayer" ] && { ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."; } chmod +x "$TARGET"/bin/* chmod +x "$MODULE_BUILD_DIR"/usr/{bin,sbin}/* + chmod +x "$TARGET"/lib/*.sh pinfo "Patching LIBCONF_DIR" local file="" for file in $(grep -rl "@@LIBCONF_DIR@@" "$MODULE_BUILD_DIR"); do -- cgit v1.2.3-55-g7522 From 30d6144a64d58ebb89e01ec7ccdc19149138c5c1 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 17:59:40 +0200 Subject: dummy file for /etc/skel --- remote/modules/pam/data/etc/skel/README | 1 + 1 file changed, 1 insertion(+) create mode 100644 remote/modules/pam/data/etc/skel/README (limited to 'remote/modules') diff --git a/remote/modules/pam/data/etc/skel/README b/remote/modules/pam/data/etc/skel/README new file mode 100644 index 00000000..9c558e35 --- /dev/null +++ b/remote/modules/pam/data/etc/skel/README @@ -0,0 +1 @@ +. -- cgit v1.2.3-55-g7522 From 119dafd61fb9d63d21907b238c1c3fef668215b9 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 18:01:00 +0200 Subject: gconv back in --- remote/modules/vmplayer/vmplayer.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 27cf5372..2689e12a 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -51,7 +51,7 @@ build() { post_copy() { # FIXME: gconftool is copied without dependencies - #tarcopy "$(find /usr/lib/ -name gconv -type d)" "$TARGET_BUILD_DIR" + tarcopy "$(find /usr/lib/ -name gconv -type d)" "$TARGET_BUILD_DIR" : } -- cgit v1.2.3-55-g7522 From 4859e8376f1b8ff721fc3fe52c407d6fd31f3572 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 18:08:45 +0200 Subject: fix mount error when already mounted vmware store --- remote/modules/vmplayer/vmplayer.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 2689e12a..21d28dec 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -1,7 +1,9 @@ fetch_source() { #mount vmware bundle directory [ ! -d /mnt/store/vmware ] && mkdir -p /mnt/store/vmware - mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting." + if [ "x$(ls /mnt/store/vmware)" == "x" ]; then + mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting." + fi ARCH=$(uname -m) [ "$ARCH" = "i686" ] && ARCH=i386 local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)" -- cgit v1.2.3-55-g7522