diff --git a/README_filecheck.md b/README_filecheck.md index 44fcf10..fa405ca 100644 --- a/README_filecheck.md +++ b/README_filecheck.md @@ -51,18 +51,13 @@ It will be used for the build environment and the final image. apt-get update apt-get dist-upgrade apt-get autoremove - apt-get install p7zip-full python-dev libxml2-dev libxslt1-dev pmount python-setuptools libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk + apt-get install git p7zip-full python-dev python-pip python-lxml pmount libjpeg-dev libtiff-dev libwebp-dev liblcms2-dev tcl-dev tk-dev python-tk ``` * Install python requirements ``` - pip install lxml - pip install oletools olefile - pip install officedissector - pip install exifread - pip install Pillow - pip install git+https://github.com/Rafiot/python-magic.git@travis + pip install oletools olefile officedissector exifread Pillow pip install git+https://github.com/CIRCL/PyCIRCLean.git ``` diff --git a/README_initial_setup.md b/README_initial_setup.md index 1cab87b..a6e41c2 100644 --- a/README_initial_setup.md +++ b/README_initial_setup.md @@ -10,14 +10,13 @@ Install the necessary packages: Create a new image from scratch =============================== -* Download the most recent Raspbian version: - http://downloads.raspberrypi.org/raspbian_latest +* Download the most recent version of Raspbian Jessie lite: + https://downloads.raspberrypi.org/raspbian_lite_latest * Unpack it: ``` - unzip 2015-05-05-raspbian-wheezy.zip - mv 2015-05-05-raspbian-wheezy.zip raspbian-wheezy.zip + unzip 2016-03-18-raspbian-jessie-lite.zip ``` Prepare the base image diff --git a/mount_image.sh b/mount_image.sh index ada028b..915a62b 100755 --- a/mount_image.sh +++ b/mount_image.sh @@ -35,8 +35,8 @@ PARTITION_BOOT='/dev/mmcblk0p1' # If you use the img ##### Debian -IMAGE='raspbian-wheezy.img' -OFFSET_ROOTFS=$((122880 * 512)) +IMAGE='2016-04-26_CIRCLean.img' +OFFSET_ROOTFS=$((131072 * 512)) OFFSET_BOOT=$((8192 * 512)) ##### Arch #IMAGE='archlinux-hf-2013-02-11.img' diff --git a/resize_img.md b/resize_img.md index 5d8f706..8d7abec 100644 --- a/resize_img.md +++ b/resize_img.md @@ -4,44 +4,47 @@ Add empty space to the image * Add 2Gb ``` - > dd if=/dev/zero bs=1024k count=2048 >> 2015-02-16-raspbian-wheezy.img + > dd if=/dev/zero bs=1024k count=2048 >> 2016-03-18-raspbian-jessie-lite.img ``` Expand partition size ===================== ``` - > fdisk 2015-02-16-raspbian-wheezy.img + > fdisk 2016-03-18-raspbian-jessie-lite.img Command (m for help): *p* - - Disk 2013-02-09-wheezy-raspbian.img: 4087 MB, 4087349248 bytes - 255 heads, 63 sectors/track, 496 cylinders, total 7983104 sectors - Units = sectors of 1 * 512 = 512 bytes + Disk 2016-03-18-raspbian-jessie-lite.img: 3.3 GiB, 3508535296 bytes, 6852608 sectors + Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes - Disk identifier: 0x00014d34 + Disklabel type: dos + Disk identifier: 0x6f92008e - Device Boot Start End Blocks Id System - 2015-02-16-raspbian-wheezy.img1 8192 122879 57344 c W95 FAT32 (LBA) - 2015-02-16-raspbian-wheezy.img2 *122880* 3788799 1832960 83 Linux + Device Boot Start End Sectors Size Id Type + 2016-03-18-raspbian-jessie-lite.img1 8192 131071 122880 60M c W95 FAT32 (LBA) + 2016-03-18-raspbian-jessie-lite.img2 131072 2658303 2527232 1.2G 83 Linux Command (m for help): *d* - Partition number (1-4): *2* + Partition number (1,2, default 2): *2* + + Partition 2 has been deleted. Command (m for help): *n* - Partition type: + Partition type p primary (1 primary, 0 extended, 3 free) - e extended + e extended (container for logical partitions) Select (default p): - Partition number (1-4, default 2): - First sector (2048-7983103, default 2048): *122880* - Last sector, +sectors or +size{K,M,G} (122880-7983103, default 7983103): - Using default value 7983103 + + Using default response p. + Partition number (2-4, default 2): + First sector (2048-6852607, default 2048): *131072* + Last sector, +sectors or +size{K,M,G,T,P} (131072-6852607, default 6852607): + + Created a new partition 2 of type 'Linux' and of size 3.2 GiB. Command (m for help): *w* - The partition table has been altered! - + The partition table has been altered. Syncing disks. ``` diff --git a/tests/run.exp b/tests/run.exp index 33c6dbb..0bf6d05 100755 --- a/tests/run.exp +++ b/tests/run.exp @@ -7,7 +7,7 @@ spawn qemu-system-arm -kernel kernel-qemu -cpu arm1176 -m 256 -M versatilepb \ -drive file=[lindex $argv 1],index=0,media=disk \ -drive file=[lindex $argv 2],index=1,media=disk \ -drive file=[lindex $argv 0],index=2,media=disk \ - -serial stdio -soundhw all -nographic \ + -monitor none -soundhw all -nographic -serial pty \ -chardev stdio,id=mon0 -mon chardev=mon0,mode=readline \ -chardev socket,id=mon1,host=localhost,port=4444,server,nowait \ -mon chardev=mon1,mode=control,pretty=on \ diff --git a/tests/run.sh b/tests/run.sh index 0c5371b..42e9c9d 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -47,6 +47,7 @@ SETUP_DIR="setup" clean(){ mount -o loop,offset=${OFFSET_ROOTFS} ${IMAGE} ${SETUP_DIR} mv ${SETUP_DIR}/etc/ld.so.preload_bkp ${SETUP_DIR}/etc/ld.so.preload + sleep 5 umount ${SETUP_DIR} rm -rf ${SETUP_DIR} } @@ -119,7 +120,6 @@ mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_DEST} ${SETUP_DIR} rm -rf ${SETUP_DIR}/* umount ${SETUP_DIR} - # To make debugging easier echo "KittenGroomer: about to enter tests/run.exp" 1>&2