x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

[[X2Go Wiki]] page changed: doc:howto:tce
by wiki-admin＠x2go.org 25 Jan '21

25 Jan '21

A page in your DokuWiki was added or changed. Here are the details: Date : 2021/01/25 00:19 Browser : Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36 IP-Address : 82.212.29.219 Hostname : HSI-KBW-082-212-029-219.hsi.kabelbw.de Old Revision: https://wiki.x2go.org/doku.php/doc:howto:tce?rev=1611533899 New Revision: https://wiki.x2go.org/doku.php/doc:howto:tce Edit Summary: [Starting the Build] This is part two of the patch to create Images for the Raspberry Pi User : stefanbaur @@ -248,13 +248,16 @@ . ./x2go-tce-config # Create Timestamp LBX2GO_TIMESTAMP=$(date +"%Y%m%d%H%M%S") + + exec > >(tee "/tmp/$LBX2GO_TIMESTAMP.log") 2>&1 # Set Directory name - LBX2GO_TCEDIR="./live-build-x2go-${LBX2GO_TIMESTAMP}-${LBX2GO_IMAGETYPE}-$(echo "$LBX2GO_ARCH" | awk '{print $2}')-${LBX2GO_CONFIG##*/}" + LBX2GO_TCEDIR="./live-build-x2go-${LBX2GO_TIMESTAMP}-${LBX2GO_IMAGETYPE}-$(echo $LBX2GO_ARCH | awk '{print $2}')-${LBX2GO_CONFIG##*/}" if [ -z "$LBX2GO_ARCH" ] || + ( echo "$LBX2GO_ARCH" | grep -q "arm" && [ -z "$LBX2GO_ARCH_MODEL" ] ) || [ -z "$LBX2GO_SPACE" ] || [ -z "$LBX2GO_CONFIG" ] || [ -z "$LBX2GO_DEFAULTS" ] || [ -z "$LBX2GO_DEBVERSION" ] || @@ -264,8 +267,9 @@ [ -z "$LBX2GO_BOOTLOADER" ] || [ -z "$LBX2GO_ARCHIVE_AREAS" ]; then echo -e "One or more of the following variables is unset:" echo -e "LBX2GO_ARCH: '${LBX2GO_ARCH}'" + echo "$LBX2GO_ARCH" | grep -q "arm" && echo -e "LBX2GO_ARCH_MODEL: '${LBX2GO_ARCH_MODEL}'" echo -e "LBX2GO_SPACE: '${LBX2GO_SPACE}'" echo -e "LBX2GO_DEFAULTS: '${LBX2GO_DEFAULTS}'" echo -e "LBX2GO_DEBVERSION: '${LBX2GO_DEBVERSION}'" echo -e "LBX2GO_CONFIG: '${LBX2GO_CONFIG}'" @@ -280,24 +284,82 @@ # This will create a timestamped subdirectory for the build mkdir -p $LBX2GO_TCEDIR cd $LBX2GO_TCEDIR + X2GO_LBCONFIG_STRING=$(cat <<X2GOLBCONFIGSTRING lb config $LBX2GO_ARCH $LBX2GO_SPACE $LBX2GO_DEFAULTS \ --config $LBX2GO_CONFIG --binary-images $LBX2GO_IMAGETYPE \ --archive-areas "$LBX2GO_ARCHIVE_AREAS" \ --bootappend-live "$LBX2GO_BOOTAPPEND_LIVE" + X2GOLBCONFIGSTRING + ) + # Our previous way of doing this had issues with newlines and multiple blanks. So we're now doing a bit + # of sanitizing, then we eval the variable. + X2GO_LBCONFIG_STRING=$(echo "$X2GO_LBCONFIG_STRING" | tr '\n' ' ' | tr -s ' ') + eval "$X2GO_LBCONFIG_STRING" + # This will copy any patches we have prepared if [ -d "../patch" ] ; then cp -a ../patch/* config/ fi + # This will copy any patches we have prepared for minidesktop if [ -d "../patch-minidesktop" ] && (echo "$LBX2GO_CONFIG" | grep -q minidesktop) ; then cp -a ../patch-minidesktop/* config/ fi + + # This checks if a bootloader directory is present (e.g. because of a custom splash.svg) + # and adds all other files that might be missing (live-build won't add them automatically + # if the directory already exists) + if [ -d config/bootloaders ] ; then + rsync -aPH --ignore-existing --exclude="splash.svg" /usr/share/live/build/bootloaders/* config/bootloaders + fi + # When enabled, this silences the audible beep at syslinux/isolinux/pxelinux/extlinux startup. + # Note that this is an accessibility feature for blind users, so use with care. + sed -e "s/$(echo -e "\07")//g" -i config/bootloaders/*/menu.cfg + # This enables an i386-only package in the sources.list file when an i386 build is requested - if echo "$LBX2GO_ARCH" | grep -q -i "i386" ; then + if echo $LBX2GO_ARCH | grep -q -i "i386" ; then sed -i -e 's/# for i386 only #//' config/package-lists/desktop.list.chroot fi + + # This is part of our experimental ARM support + # It adds required arm64-only packages when an arm64 build is requested + if echo $LBX2GO_ARCH | grep -q "arm" ; then + + # firmware for wifi + echo "firmware-brcm80211/buster-backports" >>config/package-lists/raspi.list.chroot + + if [ "$LBX2GO_ARCH_MODEL" = "Pi3" ] ; then + # modules required for Raspberry Pi 3 LAN + echo "crc16" >> config/includes.chroot/etc/initramfs-tools/modules + echo "mii" >> config/includes.chroot/etc/initramfs-tools/modules + echo "smsc95xx" >> config/includes.chroot/etc/initramfs-tools/modules + echo "usbcore" >> config/includes.chroot/etc/initramfs-tools/modules + echo "usbnet" >> config/includes.chroot/etc/initramfs-tools/modules + echo "fake-hwclock" >>config/package-lists/raspi.list.chroot + echo "usbutils" >>config/package-lists/raspi.list.chroot + + # firmware for basic raspi functions - required for boot on Pi3 + echo "raspi3-firmware/buster" >>config/package-lists/raspi.list.chroot + # standard linux kernel - for Pi3 + echo "linux-image-arm64/buster" >>config/package-lists/raspi.list.chroot + + elif [ "$LBX2GO_ARCH_MODEL" = "Pi4" ] ; then + # firmware for basic raspi functions - required for boot on Pi4 + echo "raspi3-firmware/buster-backports" >>config/package-lists/raspi.list.chroot + echo "raspi-firmware/buster-backports" >>config/package-lists/raspi.list.chroot + + # newer linux kernel - required for pi4/pi400 + echo "linux-image-arm64/buster-backports" >>config/package-lists/raspi.list.chroot + + else + echo "WARNING: ARM Platform selected, but unknown model: '$LBX2GO_ARCH_MODEL'. Assuming no additional packages/patches are required." + fi + + fi + + # This is for minidesktop builds only if [ -f config/package-lists/firefox-langpacks.list.chroot ]; then if [ -n "$LBX2GO_LANG" ]; then for LBX2GO_SINGLE_LANG in $(echo "$LBX2GO_LANG" | tr ';' ' '); do @@ -326,108 +388,114 @@ # Here, we should have reached a point where it is safe to point all proxy variables # at the apt-cacher-ng proxy. If you're seeing errors during your build that hint # at files not being downloaded, disable these three entries. export https_proxy=$LB_APT_HTTP_PROXY - export http_proxy=$LB_APT_HTTP_PROXY + export http_proxy=$LB_APT_HTTP_PROXY export ftp_proxy=$LB_APT_FTP_PROXY fi - # This is a crude hack to detect crossbuilds for ARM on Intel/AMD hardware. - # It makes some necessary changes, and also tries to speed up squashfs creation. - if (uname -r | grep -q 'i.86' || uname -r | grep -q 'amd64') && \ - echo "$LBX2GO_ARCH" | grep -q 'arm'; then + # This is part of our experimental ARM support + # It is used when building for the ARM architecture (on Intel/AMD hardware and on ARM). + # It makes some necessary changes, and also tries to speed up squashfs creation when it + # detects a crossbuild environment. + if echo $LBX2GO_ARCH | grep -q 'arm'; then - # This command removes all references to fuseext and x2gothinclient from the - # package list files. Currently needed as there are no ARM packages for either. - echo "WARNING: Removing all references to fuseext and x2gothinclient from the build." - sed -e 's/^.*fuseext.*$//g' -e 's/^.*x2gothinclient.*$//g' -i ./config/package-lists/* + # This command removes all references to fuseext, freerdp-nightly, and x2gothinclient from the + # package list files. Currently needed as there are no ARM packages for any of these. + echo "WARNING: Removing all references to fuseext,freerdp-nightly and x2gothinclient from the build." + sed -e 's/^.*fuseext.*$//g' -e 's/^.*freerdp-nightly.*$//g' -e 's/^.*x2gothinclient.*$//g' -i ./config/package-lists/* - # This command removes the X2Go repository from the directory where additional - # archives are stored. Currently needed as the X2Go repository offers no arm64 + # This command removes the X2Go repository from the directory where additional + # archives are stored. Currently needed as the X2Go repository offers no arm64 # packages, but Debian Buster does - so that's what we're falling back to. echo "WARNING: Removing all references to the X2Go repository from the build." rm ./config/archives/*x2go* - # The following is a hack to reduce squashfs creation time. We're replacing mksquashfs - # in the changeroot environment with a wrapper script that drops the original - # mksquashfs call into a file. + # The following is a hack to reduce squashfs creation time in a crossbuild environment. + # We're replacing mksquashfs in the changeroot with a wrapper script that drops the + # original mksquashfs call into a file. - # We need to do this as a background task, waiting for the mksquashfs executable to - # appear in the changeroot; as the changeroot will only be created later on, once - # lb build is called. - - # The other background task waits until the command file has been created, then - # it applies some necessary patches to it, and starts the mksquashfs command natively - # on the build host, rather than in the changeroot environment. - # This is because in the changeroot, we'd be running the ARM mksquashfs in a qemu - # software emulation of the ARM architecture, while on the host, we can use all the - # native, raw CPU power and cores available to us. + if (uname -r | grep -q 'i.86' || uname -r | grep -q 'amd64') ; then + # We need to do this as a background task, waiting for the mksquashfs executable to + # appear in the changeroot; as the changeroot will only be created later on, once + # lb build is called. - # To make sure we don't have any lingering processes in the background, we're passing - # our own PID along to the background tasks, and tell them to terminate if our PID - # disappears while they're still in their waiting/looping state. + # The other background task waits until the command file has been created, then + # it applies some necessary patches to it, and starts the mksquashfs command natively + # on the build host, rather than in the changeroot environment. + # This is because in the changeroot, we'd be running the ARM mksquashfs in a qemu + # software emulation of the ARM architecture, while on the host, we can use all the + # native, raw CPU power and cores available to us. - MASTERPID=$$ + # To make sure we don't have any lingering processes in the background, we're passing + # our own PID along to the background tasks, and tell them to terminate if our PID + # disappears while they're still in their waiting/looping state. - # Replace mksquashfs in chroot with script - # (script will undo this upon completion) - ( - # wait until the chroot has been populated or until our parent process dies - while ! [ -x ./chroot/usr/bin/mksquashfs ]; do - ps $MASTERPID >/dev/null || exit 1 - sleep 1 - done - # make sure we don't overwrite the real executable if it has already been - # moved out of the way - if ! [ -x ./chroot/usr/bin/mksquashfs.real ]; then - cp ./chroot/usr/bin/mksquashfs ./chroot/usr/bin/mksquashfs.real - fi - echo '#!/bin/bash' >./chroot/usr/bin/mksquashfs - # log the name we've been called with and all parameters into this file - echo 'echo "$0 $@" >/tmp/filesystem.squashfs.temp' >>./chroot/usr/bin/mksquashfs - # once the native mksquashfs is complete, we will remove this file - echo 'while [ -f /tmp/filesystem.squashfs.temp ]; do' >>./chroot/usr/bin/mksquashfs - echo ' sleep 1' >>./chroot/usr/bin/mksquashfs - echo 'done' >>./chroot/usr/bin/mksquashfs - # so let's wait until it has been removed before deleting ourselves ... - echo 'rm /usr/bin/mksquashfs' >>./chroot/usr/bin/mksquashfs - # ... and moving the real executable back into its place - echo 'mv /usr/bin/mksquashfs.real /usr/bin/mksquashfs' >>./chroot/usr/bin/mksquashfs - chmod 755 ./chroot/usr/bin/mksquashfs - ) & + MASTERPID=$$ - # start the native mksquashfs after patching the parameters - ( - # wait until the trigger file has been created or until our parent process dies - while ! [ -f ./chroot/tmp/filesystem.squashfs.temp ]; do - ps $MASTERPID >/dev/null || exit 1 - sleep 1 - done - # using any of the available filters (x86, arm, armthumb) for the - # -Xbcj command results in an unusable squashfs on arm, so we drop the - # parameter completely if it's there. - # also, all absolute paths (detected by beginning with " /") need to be - # prefixed with "./chroot" so the mksquashfs outside the chroot knows where - # to look for the corresponding paths/files. - sed -e 's/ -Xbcj x86/ /g' -e 's# /# ./chroot/#g' -i \ - ./chroot/tmp/filesystem.squashfs.temp - # now let's make this executable - chmod 755 ./chroot/tmp/filesystem.squashfs.temp + # Replace mksquashfs in chroot with script + # (script will undo this upon completion) + ( + # wait until the chroot has been populated or until our parent process dies + while ! [ -x ./chroot/usr/bin/mksquashfs ]; do + ps $MASTERPID >/dev/null || exit 1 + sleep 1 + done + # make sure we don't overwrite the real executable if it has already been + # moved out of the way + if ! [ -x ./chroot/usr/bin/mksquashfs.real ]; then + cp ./chroot/usr/bin/mksquashfs ./chroot/usr/bin/mksquashfs.real + fi + echo '#!/bin/bash' >./chroot/usr/bin/mksquashfs + # log the name we've been called with and all parameters into this file + echo 'echo "$0 $@" >/tmp/filesystem.squashfs.temp' >>./chroot/usr/bin/mksquashfs + # once the native mksquashfs is complete, we will remove this file + echo 'while [ -f /tmp/filesystem.squashfs.temp ]; do' >>./chroot/usr/bin/mksquashfs + echo ' sleep 1' >>./chroot/usr/bin/mksquashfs + echo 'done' >>./chroot/usr/bin/mksquashfs + # so let's wait until it has been removed before deleting ourselves ... + echo 'rm /usr/bin/mksquashfs' >>./chroot/usr/bin/mksquashfs + # ... and moving the real executable back into its place + echo 'mv /usr/bin/mksquashfs.real /usr/bin/mksquashfs' >>./chroot/usr/bin/mksquashfs + chmod 755 ./chroot/usr/bin/mksquashfs + ) & - # we also need to add some more excludes because they shouldn't end up - # in the squashfs - no idea why we don't need them while inside the chroot ... - echo 'proc/*' >>./chroot/excludes - echo 'sys/*' >>./chroot/excludes - echo 'dev/pts/*' >>/.chroot.excludes - # now let's execute the script and, if it terminates without an error, - # we'll move the newly created squashfs into the chroot where the chrooted - # mksquashfs command would have created it; if that worked as well, we'll - # remove the script file so our dummy mksquashfs inside the chroot knows - # it's time to terminate itself. - ./chroot/tmp/filesystem.squashfs.temp && \ - mv ./filesystem.squashfs ./chroot/ && \ - rm ./chroot/tmp/filesystem.squashfs.temp - ) & + # start the native mksquashfs after patching the parameters + ( + # wait until the trigger file has been created or until our parent process dies + while ! [ -f ./chroot/tmp/filesystem.squashfs.temp ]; do + ps $MASTERPID >/dev/null || exit 1 + sleep 1 + done + # using any of the available filters (x86, arm, armthumb) for the + # -Xbcj command results in an unusable squashfs on arm, so we drop the + # parameter completely if it's there. + # also, all absolute paths (detected by beginning with " /") need to be + # prefixed with "./chroot" so the mksquashfs outside the chroot knows where + # to look for the corresponding paths/files. + sed -e 's/ -Xbcj x86/ /g' -e 's# /# ./chroot/#g' -i \ + ./chroot/tmp/filesystem.squashfs.temp + #needs switch from e.g. /bin/mksquashfs to $(which mksquashfs) + sed -e "s#^.*mksquashfs#$(which mksquashfs)#g" -i \ + ./chroot/tmp/filesystem.squashfs.temp + # now let's make this executable + chmod 755 ./chroot/tmp/filesystem.squashfs.temp + + # we also need to add some more excludes because they shouldn't end up + # in the squashfs - no idea why we don't need them while inside the chroot ... + echo 'proc/*' >>./chroot/excludes + echo 'sys/*' >>./chroot/excludes + echo 'dev/pts/*' >>/.chroot.excludes + # now let's execute the script and, if it terminates without an error, + # we'll move the newly created squashfs into the chroot where the chrooted + # mksquashfs command would have created it; if that worked as well, we'll + # remove the script file so our dummy mksquashfs inside the chroot knows + # it's time to terminate itself. + ./chroot/tmp/filesystem.squashfs.temp && \ + mv ./filesystem.squashfs ./chroot/ && \ + rm ./chroot/tmp/filesystem.squashfs.temp + ) & + fi fi if lb build ; then echo -e "Build is done: '$LBX2GO_TCEDIR'" @@ -435,11 +503,51 @@ ln $(realpath ./chroot/initrd.img) ./x2go-tce-initrd.img ln ./binary/live/filesystem.squashfs ./x2go-tce-filesystem.squashfs if [ "$LBX2GO_IMAGETYPE" = "hdd" ] ; then - ln ./live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').img \ - ./x2go-tce-live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').img + ln ./live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').img \ + ./x2go-tce-live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').img fi + + # This is part of our experimental ARM support + if [ "$LBX2GO_IMAGETYPE" = "hdd" ] && echo $LBX2GO_ARCH | grep -q "arm" ; then + # after the build, let's determine the name of our image file ... + IMAGEFILE="./x2go-tce-live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').img" + + # ... and change the partition type to reflect the file system actually in use for partition 1 + # ("b" is FAT32) + sfdisk --part-type $IMAGEFILE 1 b + + # next, we need to patch two things inside the image, so we need to set up a loop device for it. + FREELOOP=$(losetup -f) # note that this could become a TOCTOU issue if more than 1 process tries to use loop devices + + # as the image is a full disk image containing a partition, we need to jump to the position where the first partition starts + losetup -o 1048576 $FREELOOP $IMAGEFILE + + # now let's mount it + mkdir -p ./tempmount + mount $FREELOOP ./tempmount + + # purge this dir, so we have enough space; we'll return to fill it later + rm ./tempmount/live/* + + # first, we copy the contents of the boot/firmware/ folder to the root directory, because that is where these files are needed + # see if inplace helps against out of space errors + rsync -aP --inplace ./chroot/boot/firmware/* ./tempmount + + mkdir -p ./tempmount/live/ + rsync -aP ./binary/live/*.squashfs ./tempmount/live/ + + # next, we replace the "root=" parameter with the parameters needed for live-booting + sed -e 's#root=/dev/mmcblk0p2 #'"$LBX2GO_BOOTAPPEND_LIVE"' #' -i ./tempmount/cmdline.txt + + # here comes the cleanup part + sync + umount $FREELOOP + losetup -d $FREELOOP + rmdir ./tempmount + fi + if [ "$LBX2GO_IMAGETYPE" = "netboot" ] ; then if [ "$LBX2GO_NOSQUASHFS" = "true" ] ; then (cd binary; echo live$'\n'live/filesystem.squashfs |cpio -o -H newc | gzip --fast) >./x2go-tce-filesystem.cpio.gz cat ./x2go-tce-initrd.img ./x2go-tce-filesystem.cpio.gz >./x2go-tce-initrd-with-fs.img || exit 1 @@ -449,14 +557,14 @@ fi fi if [ "$LBX2GO_IMAGETYPE" = "iso" ] || [ "$LBX2GO_IMAGETYPE" = "iso-hybrid" ] ; then genisoimage -o ./x2go-tce-squashfs-only.iso -R -J -graft-points live/filesystem.squashfs=./x2go-tce-filesystem.squashfs - if [ -e ./live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').hybrid.iso ] ; then - ln ./live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').hybrid.iso \ - ./original-x2go-tce-live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').hybrid.iso - elif [ -e ./live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').iso ] ; then - ln ./live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').iso \ - ./original-x2go-tce-live-image-$(echo "$LBX2GO_ARCH" | awk '{print $2}').iso + if [ -e ./live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').hybrid.iso ] ; then + ln ./live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').hybrid.iso \ + ./original-x2go-tce-live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').hybrid.iso + elif [ -e ./live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').iso ] ; then + ln ./live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').iso \ + ./original-x2go-tce-live-image-$(echo $LBX2GO_ARCH | awk '{print $2}').iso fi mv ./x2go-tce-filesystem.squashfs ./original-x2go-tce-filesystem.squashfs fi # create timestamp file @@ -485,8 +593,9 @@ fi fi cd .. fi + </code> ===== Netbooting ===== -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

[[X2Go Wiki]] page changed: doc:howto:tce
by wiki-admin＠x2go.org 25 Jan '21

25 Jan '21

A page in your DokuWiki was added or changed. Here are the details: Date : 2021/01/25 00:18 Browser : Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36 IP-Address : 82.212.29.219 Hostname : HSI-KBW-082-212-029-219.hsi.kabelbw.de Old Revision: https://wiki.x2go.org/doku.php/doc:howto:tce?rev=1610241860 New Revision: https://wiki.x2go.org/doku.php/doc:howto:tce Edit Summary: [Configuring the Build] This is part one of the patch to create Images for the Raspberry Pi User : stefanbaur @@ -42,18 +42,22 @@ # simple check for apt-cacher-ng being active - if # we have a successful connect on port 3142, assume # it's apt-cacher-ng and use it - - if nc -z 127.0.0.1 3142 ; then + # + if nc -z 127.0.0.1 3142 ; then # bad idea with apt-cacher-ng, but will work with e.g. squid - # export https_proxy=http://127.0.0.1:3128/ + # export https_proxy=http://127.0.0.1:3128/ # export http_proxy=http://127.0.0.1:3128/ # export ftp_proxy=http://127.0.0.1:3128/ export LB_APT_FTP_PROXY=http://127.0.0.1:3142/ export LB_APT_HTTP_PROXY=http://127.0.0.1:3142/ fi + + # set these to true to save source files + #export LB_SOURCE="true" + #export LBX2GO_GETSRC="true" # Select ONE of the following git reposities # this one loosely corresponds to "stable" # export LBX2GO_CONFIG='git://code.x2go.org/live-build-x2go.git::feature/openbox-magic-pixel-workar…' @@ -69,18 +73,32 @@ # 32-Bit, larger memory footprint, but faster performance on i686 and newer # export LBX2GO_ARCH='-a i386 -k 686-pae' # 32-Bit, smallest memory footprint - not available on buster # export LBX2GO_ARCH='--architectures i386 --linux-flavours 586' - # EXPERIMENTAL: For ARM (Raspberry Pi), try: - # export LBX2GO_ARCH='-a arm64' - # Note that ARM builds are currently not working, at least not on the Pi. + # For ARM (Raspberry Pi): + #export LBX2GO_ARCH='-a arm64' + #export LBX2GO_ARCH_MODEL='Pi4' # you can also set this to 'Pi3'. Note that there must not be any whitespace between 'Pi' and the digit. # If you want to use the stock ISO image as created by this script, add your boot parameters here # export LBX2GO_BOOTAPPEND_LIVE="boot=live components noswap lang=de vconsole.keymap=de keyboard-layouts=de locales=de_DE.UTF-8 silent quiet pubkey=http://x2go/x2go-tce/config/authorized_keys sessionsurl=http://x2go/x2go-tce/config/sessions toram" + + if echo -e "$LBX2GO_CONFIG" | grep -q "openbox"; then + LBX2GO_BOOTAPPEND_LIVE+="fastpo " + export LBX2GO_BOOTAPPEND_LIVE + elif echo -e "$LBX2GO_CONFIG" | grep -q "minidesktop"; then + LBX2GO_BOOTAPPEND_LIVE+='timezone=Europe/Berlin noautologin ' # if you use nottyautologin instead of noautologin, an autologin will be set for the account "user", which conflicts our setting for the account "x2gothinclient" + export LBX2GO_BOOTAPPEND_LIVE + fi # detect if the selected git repo is meant to build a buster, stretch or jessie image if [ -z "${LBX2GO_CONFIG##*-stretch}" ] ; then export LBX2GO_DEBVERSION="stretch" + export LBX2GO_BOOTAPPEND_LIVE+=" net.ifnames=0 biosdevname=0" + elif [ -z "${LBX2GO_CONFIG##*-buster-heuler}" ] ; then + export LBX2GO_DEBVERSION="buster" + export LBX2GO_BOOTAPPEND_LIVE+=" net.ifnames=0 biosdevname=0" + elif [ -z "${LBX2GO_CONFIG##*-buster-heuler-bpo}" ] ; then + export LBX2GO_DEBVERSION="buster" export LBX2GO_BOOTAPPEND_LIVE+=" net.ifnames=0 biosdevname=0" elif [ -z "${LBX2GO_CONFIG##*-buster}" ] ; then export LBX2GO_DEBVERSION="buster" export LBX2GO_BOOTAPPEND_LIVE+=" net.ifnames=0 biosdevname=0" @@ -95,9 +113,9 @@ export LBX2GO_BOOTLOADERPARAMNAME="--bootloader" fi # set boot loader type - leave this unchanged unless you really know what you're doing - if echo "$LBX2GO_ARCH" | awk '{print $2}' | grep -q "arm" && ! dpkg --print-architecture | grep -q 'arm'; then + if echo $LBX2GO_ARCH | awk '{print $2}' | grep -q "arm" ; then # This is part of our experimental ARM support LBX2GO_BOOTLOADERPARAMNAME=" " LBX2GO_BOOTLOADER=" " else @@ -136,11 +154,21 @@ $LBX2GO_BOOTLOADERPARAMNAME $LBX2GO_BOOTLOADER --distribution $LBX2GO_DEBVERSION" # This is part of our experimental ARM support - if echo "$LBX2GO_ARCH" | grep -q 'arm'; then + if echo $LBX2GO_ARCH | grep -q 'arm' && ! dpkg --print-architecture | grep -q 'arm' ; then export LBX2GO_DEFAULTS+=" --bootstrap-qemu-arch arm64 \ - --bootstrap-qemu-static /usr/bin/qemu-arm-static" + --bootstrap-qemu-static /usr/bin/qemu-aarch64-static \ + --apt-options \"--yes -oAPT::Default-Release=${LBX2GO_DEBVERSION} -oAPT::Immediate-Configure=false\" " + fi + + # This is part of our experimental ARM support + # This makes sure the resulting disk image is at least 1GB in size, even though our build currently requires way less. + # It's unlikely that anyone will need to boot from a smaller partition; but if we let live-build pick the minimum size automatically, + # we will not have enough space left to copy the firmware blobs into the right location. + if echo $LBX2GO_ARCH | grep -q 'arm' ; then + export LBX2GO_DEFAULTS+=" --binary-filesystem fat32 \ + --hdd-size 1024" fi export LBX2GO_ARCHIVE_AREAS="main contrib non-free" @@ -148,18 +176,25 @@ # export LBX2GO_LANG='de' # This is to optimize squashfs size, based on a suggestion by intrigeri from the TAILS team # note that this will permanently change /usr/lib/live/build/binary_rootfs - sed -i -e 's#MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"#MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K"#' /usr/lib/live/build/binary_rootfs + if dpkg --print-architecture | grep -q 'arm'; then + # on arm, these parameters must not be used; if they're there, we need to reinstall the package to undo our patch + if grep -q -- '-Xbcj x86 -b 1024K -Xdict-size 1024K' /usr/lib/live/build/binary_rootfs; then + apt install --reinstall live-build + fi + else + sed -i -e 's#MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"#MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K"#' /usr/lib/live/build/binary_rootfs + fi # This removes documentation, locales and man pages # You can safely enable this if you intend to run X2GoClient in fullscreen mode all the time, or when building the ssh-only rescue image. # For all other uses of the TCE-Live image creator (i.e. Minidesktop), your results may vary ... use at your own risk. export LBX2GO_TCE_SHRINK="true" # This patches the squashfs file into the initrd. Only parsed when image type "netboot" is set. # Will require boot parameter live-media=/ instead of fetch=... - # Both TFTP client and TFTP server must support file transfers >32MB for this to work, if you want to deploy this initrd via TFTP, + # Both TFTP client and TFTP server must support file transfers >32MB for this to work, if you want to deploy this initrd via TFTP, # so e.g. atftpd will not work - tftpd-hpa, however, seems to have no problem with larger files. # When using iPXE, you can use http instead of TFTP. # This is especially helpful if you want to netboot via http and cannot use the server's IP, but must specify a DNS name - as "fetch=..." only understands IPs. export LBX2GO_NOSQUASHFS="true" @@ -172,13 +207,22 @@ # to create a netboot-image: export LBX2GO_IMAGETYPE='netboot' # /!\ the options below are NOT RECOMMENDED unless you use live-build from Debian Buster /!\ # to create an image that can be written to a hard disk (for older live-build versions, this - # always results in a "build failed" message, even though the build might have worked - use + # always results in a "build failed" message, even though the build might have worked - use # live-build from Buster and things will work): # export LBX2GO_IMAGETYPE='hdd' # to create a tar file only (seems to be broken in older live-build versions - Buster works): # export LBX2GO_IMAGETYPE='tar' + + # This is part of our experimental ARM support + if echo "$LBX2GO_ARCH" | grep -q "arm" ; then + # enforce hdd image for arm at the moment (might need to support netboot later on too) + if ! [ "$LBX2GO_IMAGETYPE" = "hdd" ] ; then + echo "WARNING: Replacing selected image type with 'hdd'. That's all we currently support on ARM." + LBX2GO_IMAGETYPE="hdd" + fi + fi if [ "$LBX2GO_IMAGETYPE" = "netboot" ]; then LBX2GO_DEFAULTS+=" $LBX2GO_BOOTLOADER" fi -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

[x2goclient] branch master updated (39d3692 -> 218d222)
by git-admin＠x2go.org 22 Jan '21

22 Jan '21

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 39d3692 X2Go Client will send it's version to the broker when sending client event. new a23fc3d Makefile: Install x-x2go.xml MIME database source file for .x2go file extension. new f8624f7 debian/x2gocient.install:Install x-x2go.xml into bin:pkg x2goclient. new 07900e8 x2goclient.spec: Install x-x2go.xml into bin:pkg and run update-mime-database during postinst. new 3629633 debian{,-qt4,-qt5}: Add a Qt5-based debian(-qt5)/ packaging folder and make it easy to switch between Qt4 and Qt5 build by simply changing the symlink target of debian/ (which is, yes indeed, a symlink, not a directory anymore). new 218d222 debian/changelog: Fix too-long-lines in current stanza. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 2 + debian | 1 + {debian => debian-common}/changelog | 21 +- {debian => debian-common}/copyright | 90 +-- {debian => debian-common}/source/format | 0 debian-common/upstream/metadata | 8 + debian-common/upstream/signing-key.asc | 210 ++++++ debian-common/watch | 3 + debian-qt4/changelog | 1 + {debian => debian-qt4}/compat | 0 {debian => debian-qt4}/control | 0 debian-qt4/copyright | 1 + {debian => debian-qt4}/menu | 0 {debian => debian-qt4}/rules | 0 debian-qt4/source | 1 + debian-qt4/upstream | 1 + debian-qt4/watch | 1 + {debian => debian-qt4}/x2goclient.dirs | 0 {debian => debian-qt4}/x2goclient.docs | 0 {debian => debian-qt4}/x2goclient.examples | 0 {debian => debian-qt4}/x2goclient.install | 1 + {debian => debian-qt4}/x2goclient.manpages | 0 {debian => debian-qt4}/x2goplugin-provider.install | 0 {debian => debian-qt4}/x2goplugin.install | 0 debian-qt5/changelog | 1 + debian-qt5/control | 57 ++ debian-qt5/copyright | 1 + .../patches/1002_fix-ftbfs-on-non-linux.patch | 749 +++++++++++++++++++++ debian-qt5/patches/README | 3 + debian-qt5/patches/series | 2 + debian-qt5/patches/update_makefile_qt5-build.patch | 18 + debian-qt5/rules | 35 + debian-qt5/source | 1 + debian-qt5/upstream | 1 + debian-qt5/watch | 1 + {debian => debian-qt5}/x2goclient.dirs | 4 +- {debian => debian-qt5}/x2goclient.docs | 0 {debian => debian-qt5}/x2goclient.examples | 0 .../x2goclient.install | 10 +- x2goclient.spec | 3 +- 40 files changed, 1174 insertions(+), 53 deletions(-) create mode 120000 debian rename {debian => debian-common}/changelog (99%) rename {debian => debian-common}/copyright (64%) rename {debian => debian-common}/source/format (100%) create mode 100644 debian-common/upstream/metadata create mode 100644 debian-common/upstream/signing-key.asc create mode 100644 debian-common/watch create mode 120000 debian-qt4/changelog rename {debian => debian-qt4}/compat (100%) rename {debian => debian-qt4}/control (100%) create mode 120000 debian-qt4/copyright rename {debian => debian-qt4}/menu (100%) rename {debian => debian-qt4}/rules (100%) create mode 120000 debian-qt4/source create mode 120000 debian-qt4/upstream create mode 120000 debian-qt4/watch copy {debian => debian-qt4}/x2goclient.dirs (100%) copy {debian => debian-qt4}/x2goclient.docs (100%) copy {debian => debian-qt4}/x2goclient.examples (100%) rename {debian => debian-qt4}/x2goclient.install (90%) rename {debian => debian-qt4}/x2goclient.manpages (100%) rename {debian => debian-qt4}/x2goplugin-provider.install (100%) rename {debian => debian-qt4}/x2goplugin.install (100%) create mode 120000 debian-qt5/changelog create mode 100644 debian-qt5/control create mode 120000 debian-qt5/copyright create mode 100644 debian-qt5/patches/1002_fix-ftbfs-on-non-linux.patch create mode 100644 debian-qt5/patches/README create mode 100644 debian-qt5/patches/series create mode 100644 debian-qt5/patches/update_makefile_qt5-build.patch create mode 100755 debian-qt5/rules create mode 120000 debian-qt5/source create mode 120000 debian-qt5/upstream create mode 120000 debian-qt5/watch copy {debian => debian-qt5}/x2goclient.dirs (78%) rename {debian => debian-qt5}/x2goclient.docs (100%) rename {debian => debian-qt5}/x2goclient.examples (100%) rename debian/x2goclient.dirs => debian-qt5/x2goclient.install (60%) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 5

[x2gokdriveclient] branch master updated (9bc8585 -> 394a6ac)
by git-admin＠x2go.org 21 Jan '21

21 Jan '21

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdriveclient. from 9bc8585 use zlib library to decompress compressed strings instead of built in QT function. new 394a6ac Fix wrong buff name from previous commit. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git

1 1

[x2gokdriveclient] branch master updated (9e46d95 -> 9bc8585)
by git-admin＠x2go.org 21 Jan '21

21 Jan '21

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdriveclient. from 9e46d95 include xcb/xproto.h header new 9bc8585 use zlib library to decompress compressed strings instead of built in QT function. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: client.cpp | 38 +++++++++++++++++++++++++++++++------- client.h | 1 + debian/changelog | 1 + debian/control | 1 + x2gokdriveclient.pro | 2 ++ xcbclip.cpp | 7 +------ 6 files changed, 37 insertions(+), 13 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git

1 1

[x2gokdrive] branch master updated (aed1bdf -> 13932a6)
by git-admin＠x2go.org 20 Jan '21

20 Jan '21

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from aed1bdf support sending and recieving selections on demand. Support reading and writing INCR properties. new 13932a6 move declaration of RemoteHostVars from x2gokdriveremote.h to x2gokdriveremote.c. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2gokdriveremote.c | 1 + x2gokdriveremote.h | 2 +- x2gokdriveselection.c | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git

1 1

[x2goclient] branch master updated (bcdd8ca -> 39d3692)
by git-admin＠x2go.org 19 Jan '21

19 Jan '21

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from bcdd8ca Add mime type application/x-x2go. X2Go Client can now automatically open session files with .x2go extension. new 39d3692 X2Go Client will send it's version to the broker when sending client event. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + src/httpbrokerclient.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 1

[x2goclient] branch master updated (9903612 -> bcdd8ca)
by git-admin＠x2go.org 13 Jan '21

13 Jan '21

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 9903612 Fix maximizing client window in thinclient mode with Qt5 (bullseye). new bcdd8ca Add mime type application/x-x2go. X2Go Client can now automatically open session files with .x2go extension. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ desktop/x2goclient.desktop | 1 + mime/x-x2go.xml | 8 ++++++++ src/onmainwindow.cpp | 23 ++++++++++++++++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 mime/x-x2go.xml -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 1

[[X2Go Wiki]] page changed: events:start
by wiki-admin＠x2go.org 10 Jan '21

10 Jan '21

A page in your DokuWiki was added or changed. Here are the details: Date : 2021/01/10 19:14 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Goanna/4.7 Firefox/68.0 PaleMoon/28.17.0 IP-Address : 82.212.29.219 Hostname : HSI-KBW-082-212-029-219.hsi.kabelbw.de Old Revision: https://wiki.x2go.org/doku.php/events:start?rev=1610279322 New Revision: https://wiki.x2go.org/doku.php/events:start Edit Summary: [Tentative] -> PaM Talk confirmed User : stefanbaur @@ -13,9 +13,12 @@ * X2Go: The Gathering 2021, Essen, Stuttgart, or virtual - some time in Q3 or early Q4, depending on the Covid-19 situation * Pi and More 12 1/2, Stuttgart, Germany - some time in March 2021, if Covid-19 allows * Chemnitzer LinuxTage (CLT), virtual event - 2021-03-13 to 2021-03-14 - [[https://chemnitzer.linux-tage.de/2021/de/programm/anmeldung/live|CfP]]/[[ht…]] deadline: 2021-01-10 - CfL/CfP sent! - * Pi and More 12 1/4, virtual event - 2021-01-23 - [[https://piandmore.de/de/conference/pam12-25/call/|CfP]] - CfP deadline: 2021-01-09 23:59 - CfP sent! + ==== 2021-01-23 - Pi and More 12 1/4, Germany - Virtual Event - 9:30h to 17:30h ==== + * All event info (schedule etc.) can be found [[https://piandmore.de/en/conference/pam12-25/|here]] + * Talk (in German) by Stefan: //X2Go-ThinClientEdition-Live - now also for the Raspberry Pi?// - currently scheduled for 15:00h–15:25h (note that this may still change) + * Don't miss out on Stefan's earlier talk (unrelated to X2Go, also in German), //The Grannophone - a video phone for the elderly and dementia patients// - currently scheduled for 13:30h-13:45h (note that this may still change) ===== Previous Years ===== [[events:2020]] [[events:2019]] [[events:2018]] [[events:2017]] [[events:2016]] [[events:2015]] [[events:2014]] [[events:2013]] [[events:2012]] -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

[[X2Go Wiki]] page changed: events:start
by wiki-admin＠x2go.org 10 Jan '21

10 Jan '21

A page in your DokuWiki was added or changed. Here are the details: Date : 2021/01/10 11:48 Browser : Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:84.0) Gecko/20100101 Firefox/84.0 IP-Address : 82.212.29.219 Hostname : HSI-KBW-082-212-029-219.hsi.kabelbw.de Old Revision: https://wiki.x2go.org/doku.php/events:start?rev=1610279284 New Revision: https://wiki.x2go.org/doku.php/events:start Edit Summary: [Tentative] link cleanup User : stefanbaur @@ -13,9 +13,9 @@ * X2Go: The Gathering 2021, Essen, Stuttgart, or virtual - some time in Q3 or early Q4, depending on the Covid-19 situation * Pi and More 12 1/2, Stuttgart, Germany - some time in March 2021, if Covid-19 allows * Chemnitzer LinuxTage (CLT), virtual event - 2021-03-13 to 2021-03-14 - [[https://chemnitzer.linux-tage.de/2021/de/programm/anmeldung/live|CfP]]/[[ht…]] deadline: 2021-01-10 - CfL/CfP sent! - * Pi and More 12 1/4, virtual event - 2021-01-23 - CfP https://piandmore.de/de/conference/pam12-25/call/ - CfP deadline: 2021-01-09 23:59 - CfP sent! + * Pi and More 12 1/4, virtual event - 2021-01-23 - [[https://piandmore.de/de/conference/pam12-25/call/|CfP]] - CfP deadline: 2021-01-09 23:59 - CfP sent! ===== Previous Years ===== [[events:2020]] [[events:2019]] [[events:2018]] [[events:2017]] [[events:2016]] [[events:2015]] [[events:2014]] [[events:2013]] [[events:2012]] -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits