Added optional build environment check: add extended regular

expressions to conf/checkregexps, one per line.

Improved directory structure.

check

@@ -13,6 +13,7 @@ fi
 
 
 # Variables
+SRC=`dirname $0`
 LIVECD=$1/copy
 FIND="chroot ${LIVECD} find / -xdev"
 
@@ -79,3 +80,15 @@ sinfo "SUID/SGID:"
 ${FIND} -type f -perm /u+s      -printf '%M %u %g\t%p\n'
 ${FIND} -type f -perm /g+s,o+w  -printf '%M %u %g\t%p\n'
 ${FIND} -type d -perm /a+st,o+w -printf '%M %u %g\t%p\n'
+
+sinfo "Build environment:"
+if [ -e ${SRC}/conf/checkregexps ]; then
+    regexps=`cat ${SRC}/conf/checkregexps | tr '\n' '|' | sed 's/^/(/; s/|$/)/'`
+    chroot ${LIVECD}/../src grep   -iE "${regexps}" /usr/src/linux/arch/x86/boot/compressed/vmlinux.bin
+    chroot ${LIVECD}        lzgrep -iE "${regexps}" /boot/initrd-x86.lzm
+    ${FIND} -type f ! -name '*.mo' ! -name 'words.*' ! -name '*.rws' \
+        ! -name 'libgucharmap.so.*' ! -name oui.txt \
+        | chroot ${LIVECD} xargs grep -liE "${regexps}"
+else
+    echo "checkregexp file not found, skipping"
+fi

enter

@@ -15,7 +15,7 @@ fi
 # Variables
 SRC=`dirname $0`/src
 
-version=`cat ${SRC}/../version`
+version=`cat ${SRC}/../conf/version`
 environment="VERSION=${version} LOGNAME=root USER=root HOME=/root HOSTNAME=liberte"
 for env in LANG TERM RSYNC_PROXY http_proxy https_proxy ftp_proxy no_proxy; do
     if printenv ${env} 1>/dev/null; then

mkdist

@@ -17,7 +17,7 @@ SRC=`dirname $0`
 DIST=$1/dist
 # SVN=https://liberte.svn.sourceforge.net/svnroot/liberte/tags
 
-version=`cat ${SRC}/version`
+version=`cat ${SRC}/conf/version`
 distname=liberte-${version}
 
 

mkimage

@@ -17,7 +17,7 @@ SRC=`dirname $0`
 LIVECD=$1/copy
 USBROOT=$1/dist/liberte
 
-version=`cat ${SRC}/version`
+version=`cat ${SRC}/conf/version`
 distname=liberte-${version}
 
 # see the /root/bin/ps-mount script
@@ -56,7 +56,7 @@ sinfo "Creating SquashFS image"
 
 ${mksquashfs} ${LIVECD} ${USBROOT}/boot/root-x86.sfs -noappend \
     -no-exports -no-progress \
-    -sort ${SRC}/rootfs.sort -e boot
+    -sort ${SRC}/conf/rootfs.sort -e boot
 chmod 644 ${USBROOT}/boot/root-x86.sfs
 
 

mkroot

@@ -22,7 +22,7 @@ portage=${MIRROR}/snapshots/portage-latest.tar.bz2
 
 # Don't rely on the HKP outbounding port being open
 gpg_wwwserver='https://zimmermann.mayfirst.org/pks/lookup?op=get&search=0x${fpr}'
-gpg_keys=`sed '/^#/d; /^$/d; s/ //g' ${FROM}/pubkeys`
+gpg_keys=`sed '/^#/d; /^$/d; s/ //g' ${FROM}/conf/pubkeys`
 
 mfpl=https://support.mayfirst.org/raw-attachment/wiki/mfpl_certificate_authority/mfpl.crt
 
@@ -30,19 +30,19 @@ mfpl=https://support.mayfirst.org/raw-attachment/wiki/mfpl_certificate_authority
 # Copying and pruning
 if [ "$2" = copy ]; then
     sinfo "Copying ${LIVECD}/src to ${LIVECD}/copy"
-    rsync -aHAXS -x -i --delete-excluded          \
-        --include-from=${FROM}/rootfs.includes    \
-        --exclude-from=${FROM}/rootfs-cp.excludes \
+    rsync -aHAXS -x -i --delete-excluded               \
+        --include-from=${FROM}/conf/rootfs.includes    \
+        --exclude-from=${FROM}/conf/rootfs-cp.excludes \
         ${LIVECD}/src/ ${LIVECD}/copy | head -n 20
 
     sinfo "Done."
     exit
 elif [ "$2" = clean ]; then
     sinfo "Pruning ${LIVECD}/copy"
-    rsync -aHAXS -x -i --delete-excluded          \
-        --include-from=${FROM}/rootfs.includes    \
-        --exclude-from=${FROM}/rootfs.excludes    \
-        --exclude-from=${FROM}/rootfs-cp.excludes \
+    rsync -aHAXS -x -i --delete-excluded               \
+        --include-from=${FROM}/conf/rootfs.includes    \
+        --exclude-from=${FROM}/conf/rootfs.excludes    \
+        --exclude-from=${FROM}/conf/rootfs-cp.excludes \
         ${LIVECD}/copy/ ${LIVECD}/copy | head
 
     ${FROM}/check ${LIVECD}