Handling source enabled/disabled trigger from within auto/config rather than from...
authorDaniel Baumann <mail@daniel-baumann.ch>
Wed, 27 Mar 2013 10:27:01 +0000 (11:27 +0100)
committerDaniel Baumann <mail@daniel-baumann.ch>
Mon, 1 Apr 2013 08:26:19 +0000 (10:26 +0200)
examples/live-images-wheezy
images/gnome-desktop/auto/config
images/kde-desktop/auto/config
images/lxde-desktop/auto/config
images/rescue/auto/config
images/standard/auto/config
images/xfce-desktop/auto/config

index 202d24b..564f781 100755 (executable)
@@ -32,9 +32,7 @@ do
                esac
 
                # iso-hybrid
-               [ "${_ARCHITECTURE}" = i386 ] && lb config ${_AREAS} ${_BOOTAPPEND} --source true
                lb build
-               [ "${_ARCHITECTURE}" = i386 ] && lb config ${_AREAS} ${_BOOTAPPEND} --source false
 
                mv build.log               ${_NAME}-${_ARCHITECTURE}-${_FLAVOUR}${_SUFFIX}.iso.log
                mv binary.contents         ${_NAME}-${_ARCHITECTURE}-${_FLAVOUR}${_SUFFIX}.iso.contents
@@ -62,7 +60,7 @@ do
                                ;;
                esac
 
-               if [ "${_ARCHITECTURE}" = "i386" ]
+               if ls source.* > /dev/null 2>&1
                then
                        # sources
                        mv source.debian.contents      ${_NAME}-source-${_FLAVOUR}${_SUFFIX}.debian.tar.contents
index c9053aa..e74ee52 100755 (executable)
@@ -5,10 +5,12 @@ set -e
 case "$(dpkg --print-architecture)" in
        amd64)
                _LINUX_FLAVOURS="amd64"
+               _SOURCE="false"
                ;;
 
        i386)
                _LINUX_FLAVOURS="486 686-pae"
+               _SOURCE="true"
                ;;
 esac
 
@@ -19,4 +21,5 @@ lb config noauto \
        --debian-installer live \
        --linux-flavours "${_LINUX_FLAVOURS}" \
        --linux-packages "linux-image linux-headers" \
+       --source "${_SOURCE}" \
 "${@}"
index c9053aa..e74ee52 100755 (executable)
@@ -5,10 +5,12 @@ set -e
 case "$(dpkg --print-architecture)" in
        amd64)
                _LINUX_FLAVOURS="amd64"
+               _SOURCE="false"
                ;;
 
        i386)
                _LINUX_FLAVOURS="486 686-pae"
+               _SOURCE="true"
                ;;
 esac
 
@@ -19,4 +21,5 @@ lb config noauto \
        --debian-installer live \
        --linux-flavours "${_LINUX_FLAVOURS}" \
        --linux-packages "linux-image linux-headers" \
+       --source "${_SOURCE}" \
 "${@}"
index c9053aa..e74ee52 100755 (executable)
@@ -5,10 +5,12 @@ set -e
 case "$(dpkg --print-architecture)" in
        amd64)
                _LINUX_FLAVOURS="amd64"
+               _SOURCE="false"
                ;;
 
        i386)
                _LINUX_FLAVOURS="486 686-pae"
+               _SOURCE="true"
                ;;
 esac
 
@@ -19,4 +21,5 @@ lb config noauto \
        --debian-installer live \
        --linux-flavours "${_LINUX_FLAVOURS}" \
        --linux-packages "linux-image linux-headers" \
+       --source "${_SOURCE}" \
 "${@}"
index c9053aa..e74ee52 100755 (executable)
@@ -5,10 +5,12 @@ set -e
 case "$(dpkg --print-architecture)" in
        amd64)
                _LINUX_FLAVOURS="amd64"
+               _SOURCE="false"
                ;;
 
        i386)
                _LINUX_FLAVOURS="486 686-pae"
+               _SOURCE="true"
                ;;
 esac
 
@@ -19,4 +21,5 @@ lb config noauto \
        --debian-installer live \
        --linux-flavours "${_LINUX_FLAVOURS}" \
        --linux-packages "linux-image linux-headers" \
+       --source "${_SOURCE}" \
 "${@}"
index c9053aa..e74ee52 100755 (executable)
@@ -5,10 +5,12 @@ set -e
 case "$(dpkg --print-architecture)" in
        amd64)
                _LINUX_FLAVOURS="amd64"
+               _SOURCE="false"
                ;;
 
        i386)
                _LINUX_FLAVOURS="486 686-pae"
+               _SOURCE="true"
                ;;
 esac
 
@@ -19,4 +21,5 @@ lb config noauto \
        --debian-installer live \
        --linux-flavours "${_LINUX_FLAVOURS}" \
        --linux-packages "linux-image linux-headers" \
+       --source "${_SOURCE}" \
 "${@}"
index c9053aa..e74ee52 100755 (executable)
@@ -5,10 +5,12 @@ set -e
 case "$(dpkg --print-architecture)" in
        amd64)
                _LINUX_FLAVOURS="amd64"
+               _SOURCE="false"
                ;;
 
        i386)
                _LINUX_FLAVOURS="486 686-pae"
+               _SOURCE="true"
                ;;
 esac
 
@@ -19,4 +21,5 @@ lb config noauto \
        --debian-installer live \
        --linux-flavours "${_LINUX_FLAVOURS}" \
        --linux-packages "linux-image linux-headers" \
+       --source "${_SOURCE}" \
 "${@}"