[X2Go-Commits] [[X2Go Wiki]] page changed: doc:howto:tce

[wiki-admin at x2go.org]

A page in your DokuWiki was added or changed. Here are the details:

Date        : 2017/11/20 18:11
Browser     : Mozilla/5.0 (X11; Linux x86_64; rv:52.9) Gecko/20100101 Goanna/3.4 Firefox/52.9 PaleMoon/27.6.0
IP-Address  : 134.3.37.90
Hostname    : HSI-KBW-134-3-37-90.hsi14.kabel-badenwuerttemberg.de
Old Revision: https://wiki.x2go.org/doku.php/doc:howto:tce?rev=1511201232
New Revision: https://wiki.x2go.org/doku.php/doc:howto:tce
Edit Summary: [Starting the Build] added stretch support, added i386-only activation of geode xserver package
User        : stefanbaur

@@ -369,26 +369,27 @@
  </code>
  
  ==== Starting the Build ====
  Change to a directory where you want to save your builds, and run the following commands:<code>
- 
  # Create Timestamp
- LBX2GO_TIMESTAMP=$(date +"%Y%m%d%H%M%S") 
+ LBX2GO_TIMESTAMP=$(date +"%Y%m%d%H%M%S")
  
  # Set Directory name
  LBX2GO_TCEDIR=./live-build-x2go-$LBX2GO_TIMESTAMP
  
  if [ -z "$LBX2GO_ARCH" ] ||
     [ -z "$LBX2GO_SPACE" ] ||
     [ -z
"$LBX2GO_CONFIG" ] ||
     [ -z "$LBX2GO_DEFAULTS" ] ||
+    [ -z "$LBX2GO_DEBVERSION" ] ||
     [ -z "$LBX2GO_IMAGETYPE" ] ||
     [ -z "$LBX2GO_TIMESTAMP" ] ||
     [ -z "$LBX2GO_ARCHIVE_AREAS" ]; then
      echo -e "One or more of the following variables is unset:"
      echo -e "LBX2GO_ARCH: '${LBX2GO_ARCH}'"
      echo -e "LBX2GO_SPACE: '${LBX2GO_SPACE}'"
      echo -e "LBX2GO_DEFAULTS: '${LBX2GO_DEFAULTS}'"
+     echo -e "LBX2GO_DEBVERSION: '${LBX2GO_DEBVERSION}'"
      echo -e "LBX2GO_CONFIG: '${LBX2GO_CONFIG}'"
      echo -e "LBX2GO_IMAGETYPE: '${LBX2GO_IMAGETYPE}'"
      echo -e "LBX2GO_TIMESTAMP: '${LBX2GO_TIMESTAMP}'"
      echo -e "LBX2GO_ARCHIVE_AREAS: '${LBX2GO_ARCHIVE_AREAS}'"
@@ -401,10 +402,15 @@
  
      lb config $LBX2GO_ARCH $LBX2GO_SPACE $LBX2GO_DEFAULTS \
         --config $LBX2GO_CONFIG --binary-images $LBX2GO_IMAGETYPE \
         --archive-areas "$LBX2GO_ARCHIVE_AREAS"
+     # This will copy any patches we have prepared
      if [ -d "../patch" ] ; then
      
   cp -a ../patch/* config/
+     fi
+     # 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
+         sed -i -e 's/# for i386 only #//' config/package-lists/desktop.list.chroot
      fi
      if [ "$LBX2GO_TCE_SHRINK" = "true" ] ; then
          echo '#!/bin/sh' >./config/hooks/0112-remove-folders.hook.chroot
          echo 'set -e' >>./config/hooks/0112-remove-folders.hook.chroot
@@ -429,9 +435,11 @@
          fi
          if [ "$LBX2GO_IMAGETYPE" = "iso" ] || [ "$LBX2GO_IMAGETYPE" = "iso-hybrid" ] ; then
              ln ./binary/live/vmlinuz ./x2go-tce-vmlinuz
              ln ./binary/live/initrd.img ./x2go-tce-initrd.img
-             genisoimage -o ./x2go-tce-squashfs-only.iso -R -J -graft-points live/filesystem.squashfs=./x2go-tce-filesystem.squashfs 
+             genisoimage -o ./x2go-tce-squashfs-only.iso -R -J -graft-points
live/filesystem.squashfs=./x2go-tce-filesystem.squashfs
+             [ -e ./live-image-amd64.hybrid.iso ] && ln ./live-image-amd64.hybrid.iso ./original-x2go-tce-live-image-amd64.hybrid.iso
+             [ -e ./live-image-amd64.iso ] && ln ./live-image-amd64.iso ./original-x2go-tce-live-image-amd64.iso
              [ -e ./live-image-i386.hybrid.iso ] && ln ./live-image-i386.hybrid.iso ./original-x2go-tce-live-image-i386.hybrid.iso
              [ -e ./live-image-i386.iso ] && ln ./live-image-i386.iso ./original-x2go-tce-live-image-i386.iso
              mv ./x2go-tce-filesystem.squashfs ./original-x2go-tce-filesystem.squashfs
          fi
@@ -446,8 +454,9 @@
          echo -e "Build failed: '$LBX2GO_TCEDIR'"
      fi
      cd ..
  fi
+ 
  </code>
  ===== Netbooting =====
  
  ==== Prerequisites ====


-- 
This mail was generated by DokuWiki at
https://wiki.x2go.org/