diff --git a/README.md b/README.md index 7997cfe..e95a21c 100644 --- a/README.md +++ b/README.md @@ -17,16 +17,16 @@ Make Embedded Linux Development happy ! For installing the collection of automazitation scripts into your PC run the following commands in shell window: ```bash - $ git clone https://github.com/molejar/emLinux.git emLinux + $ git clone https://github.com/molejar/emLinux.git $ cd emLinux $ sudo ./install.sh ``` -In Debian based distributions you can jump previous step and install directly the package `emlinux-tools_1.x-x_all.deb` +In Debian based distributions you can jump previous step and install directly the package `emlinux-tools_x.x.x_all.deb` from [dpkg](dpkg) directory with a command: ```bash - $ dpkg -i emlinux-tools_1.x-x_all.deb + $ dpkg -i emlinux-tools_x.x.x_all.deb ``` If you are using Windows OS or non Debian based distribution, then you will need to use Virtual Machine. I have created a Vagrant script which will do all the work for you. Please, continue here: [Virtual Machine Builder](docs/emlinux_vm.md) @@ -164,7 +164,7 @@ PARAMS:

2GB SD-Cart Image Format
- Example of 2GB SD-Card Image Format + Example of SD-Card Image Format (2GB)

## TODO diff --git a/dpkg/emlinux-tools_0.1.0_all.deb b/dpkg/emlinux-tools_0.1.0_all.deb index 66246d6..2d15587 100644 Binary files a/dpkg/emlinux-tools_0.1.0_all.deb and b/dpkg/emlinux-tools_0.1.0_all.deb differ diff --git a/install.sh b/install.sh index 898d89a..3fc083c 100755 --- a/install.sh +++ b/install.sh @@ -12,9 +12,9 @@ EMLINUX_VERSION="0.1.0" data_for_dpkg() { # debian/changelog file cat << EOF > ${1}/changelog -emlinux-tools ($EMLINUX_VERSION) UNRELEASED; urgency=medium +emlinux-tools ($EMLINUX_VERSION) unstable; urgency=medium - * Initial release. (Closes: #XXXXXX) + * Initial release. -- molejar Sun, 06 Mar 2016 19:24:35 +0100 EOF @@ -34,7 +34,7 @@ Architecture: all Section: Utils Priority: optional Essential: no -Depends: build-essential, u-boot-tools, qemu-user-static, binfmt-support, debootstrap, binutils, parted, git, lzop, gzip, zip +Depends: build-essential, gcc-arm-linux-gnueabi, u-boot-tools, qemu-user-static, binfmt-support, debootstrap, binutils, parted, git, lzop, gzip, zip Description: Automatization tools for embedded Linux development. This package include a collection of useful commands for compiling toolchain, u-boot, kernel, rootfs and generating bootable image. More details you can found here: https://github.com/molejar/emLinux @@ -95,6 +95,9 @@ EOF # debian/install file echo "scripts/* /sbin" > ${1}/install + + # debian/source/format file + echo "3.0 (native)" > ${1}/source/format } usage() { @@ -152,8 +155,7 @@ if [ "$param_release" = "true" ]; then TMP_DIR=$(mktemp -d) - mkdir -p $TMP_DIR/emlinux-tools-${EMLINUX_VERSION}/debian - + mkdir -p $TMP_DIR/emlinux-tools-${EMLINUX_VERSION}/debian/source data_for_dpkg "$TMP_DIR/emlinux-tools-${EMLINUX_VERSION}/debian" cp -Rf $ROOT_DIR/scripts $TMP_DIR/emlinux-tools-${EMLINUX_VERSION} cd $TMP_DIR/emlinux-tools-${EMLINUX_VERSION} diff --git a/local.conf b/local.conf index c322b6b..20b9d89 100644 --- a/local.conf +++ b/local.conf @@ -1,10 +1,8 @@ --- # Local Configuration File. Here put deviations from default.conf file -# Vagrant Box type: -# Can be set to debian/jessie64, ubuntu/xenial64, bento/ubuntu-16.04, oar-team/debian8 and etc. -vagrant_box: "ubuntu/xenial64" - -# VM Host Name and Machine Name (if machine name not defined will used same as hostname) +# The hostname must be unique inside sub-network vm_hostname: "emlinux02" + +# The machine name must be unique for each VM inside one host OS vm_machname: "emlinux02" diff --git a/scripts/build_kernel b/scripts/build_kernel index 1057669..d13ca69 100755 --- a/scripts/build_kernel +++ b/scripts/build_kernel @@ -58,7 +58,7 @@ fi echo echo '***********************************************************' -echo '* Linux Kernel Compiler *' +echo '* Linux Kernel Builder *' echo '***********************************************************' echo echo " For printing all usable options use \"build_kernel -h\"" @@ -113,7 +113,7 @@ if [ ! -z ${param_btool} ]; then fi # search for internal toolchain if not explicitly specified if [ -z $CROSS_COMPILER ]; then - echo "[INFO ] Searching Compiler ... please wait !" + echo "[INFO ] Searching Compiler, please wait !" find_toolchain "/opt /usr/bin /usr/sbin $HOME" CROSS_COMPILER=$RET_VALUE if [ -z $CROSS_COMPILER ]; then diff --git a/scripts/build_uboot b/scripts/build_uboot index 88e04db..199598c 100755 --- a/scripts/build_uboot +++ b/scripts/build_uboot @@ -54,7 +54,7 @@ fi echo echo '***********************************************************' -echo '* U-Boot Compiler *' +echo '* U-Boot Builder *' echo '***********************************************************' echo echo " For printing all usable options use \"build_uboot -h\"" @@ -109,7 +109,7 @@ if [ ! -z ${param_btool} ]; then fi # search for internal toolchain if not explicitly specified if [ -z $CROSS_COMPILER ]; then - echo "[INFO ] Searching Compiler ... please wait !" + echo "[INFO ] Searching Compiler, please wait !" find_toolchain "/opt /usr/bin /usr/sbin $HOME" CROSS_COMPILER=$RET_VALUE if [ -z $CROSS_COMPILER ]; then