Merge pull request #43 from foglamp/FOGL-3044

FOGL-3044 foglamp make_deb derived without passing an architecture argument

Author: ashish-jabble

README.rst

@@ -17,29 +17,29 @@ Internal Structure
 
 The repository contains the following set of files:
 
-- Files named with **make_** prefix, such as ``make_deb``, are the shell scripts used to build the package. The scripts accept the architecture to build as argument (currently *x86* and *arm*).
+- Files named with **make_** prefix, such as ``make_deb``, ``make_rpm``, are the shell scripts used to build the package. The script runs as per the architecture to build.
 - The **packages** folder contains the list package types to build. It contains *Debian* and *rpmbuild*, latter for RedHat/Centos RPM creation.
 
-  - Inside the *packages/Debian* folder, we have the **architecture** folders, plus a *common* folder containing files that are common to all the architectures. The architectures that we provide at the moment are *armhf* and *x86_64*.
+  - Inside the *packages/Debian* folder, we have the **architecture** folders, plus a *common* folder containing files that are common to all the architectures. The architectures that we provide at the moment are *aarch64*, *armv7l* and *x86_64*.
 
-    - Inside the architecture folder we have the DEBIAN folder, which contains all the Debian-based files, i.e. control, pre/post inst/rm, needed for the creation of the package.
+    - Inside the architecture folder we have the DEBIAN folder, which contains only control file
+    - Inside the common folder we have the DEBIAN folder, which contains pre/post inst/rm, needed for the creation of the package.
 
-  - After the first build, the *packages/Debian* will also contain a **build** folder. This folder contains a copy of what will be used to build the package (in a directory with the same name of the package) and the package itself.
+  - After the first build, the *packages/Debian* will also contain a **build/architecture** folder. This folder contains a copy of what will be used to build the package (in a directory with the same name of the package) and the package itself.
 
-    - In the *build* folder, folders and files that have a sequence number are a previous package build.
+    - In the *build/architecture* folder, folders and files that have a sequence number are a previous package build.
 
 
 The make_deb Script
 ===================
 
 .. code-block:: console
 
-  $ ./make_deb --help
-  make_deb {x86|arm} [clean|cleanall]
+  $ ./make_deb help
+  make_deb [help|clean|cleanall]
   This script is used to create the Debian package of FogLAMP
   Arguments:
-   x86      - Build an x86_64 package
-   arm      - Build an armv7l package
+   help     - Display this help text
    clean    - Remove all the old versions saved in format .XXXX
    cleanall - Remove all the versions, including the last one
   $
@@ -59,60 +59,59 @@ Building a Debian Package
 =========================
 
 First, make sure that FogLAMP is properly installed via ``make install`` somewhere on your environment (default is */usr/local/foglamp*).
-Next, select the architecture to use, *x86* or *arm*.
-Finally, run the ``make_deb`` command:
+Finally, run the ``make_deb`` command and it will make as per ``arch``:
 
 .. code-block:: console
 
-  $ ./make_deb x86
+  $ ./make_deb
   The package root directory is : /home/foglamp/foglamp-pkg
   The FogLAMP directory is      : /usr/local/foglamp
-  The FogLAMP version is        : 1.2
-  The package will be built in  : /home/foglamp/foglamp-pkg/packages/Debian/build
+  The FogLAMP version is        : 1.6.0
+  The package will be built in  : /home/foglamp/foglamp-pkg/packages/Debian/build/x86_64
   The architecture is set as    : x86_64
-  The package name is           : foglamp-1.2-x86_64
+  The package name is           : foglamp-1.6.0-x86_64
 
   Populating the package...Done.
   Building the new package...
-  dpkg-deb: building package 'foglamp' in 'foglamp-1.2-x86_64.deb'.
+  dpkg-deb: building package 'foglamp' in 'foglamp-1.6.0-x86_64.deb'.
   Building Complete.
   $
   
 The result will be:
 
 .. code-block:: console
 
-  $ ls -l packages/Debian/build/
+  $ ls -l packages/Debian/build/x86_64
   total 564
-  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:35 foglamp-1.2-x86_64
-  -rw-r--r-- 1 foglamp foglamp 572742 Mar 23 17:35 foglamp-1.2-x86_64.deb
+  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:35 foglamp-1.6.0-x86_64
+  -rw-r--r-- 1 foglamp foglamp 572742 Mar 23 17:35 foglamp-1.6.0-x86_64.deb
   $
   
 If you execute the ``make_deb`` command again, you will see:
 
 .. code-block:: console
 
-  $ ./make_deb x86
+  $ ./make_deb
   The package root directory is : /home/foglamp/foglamp-pkg
   The FogLAMP directory is      : /usr/local/foglamp
-  The FogLAMP version is        : 1.2
-  The package will be built in  : /home/foglamp/foglamp-pkg/packages/Debian/build
+  The FogLAMP version is        : 1.6.0
+  The package will be built in  : /home/foglamp/foglamp-pkg/packages/Debian/build/x86_64
   The architecture is set as    : x86_64
-  The package name is           : foglamp-1.2-x86_64
+  The package name is           : foglamp-1.6.0-x86_64
 
-  Saving the old working environment as foglamp-1.2-x86_64.0001
+  Saving the old working environment as foglamp-1.6.0-x86_64.0001
   Populating the package...Done.
-  Saving the old package as foglamp-1.2-x86_64.deb.0001
+  Saving the old package as foglamp-1.6.0-x86_64.deb.0001
   Building the new package...
-  dpkg-deb: building package 'foglamp' in 'foglamp-1.2-x86_64.deb'.
+  dpkg-deb: building package 'foglamp' in 'foglamp-1.6.0-x86_64.deb'.
   Building Complete.
   $
-  $ ls -l packages/Debian/build/
+  $ ls -l packages/Debian/build/x86_64
   total 1128
-  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:53 foglamp-1.2-x86_64
-  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:35 foglamp-1.2-x86_64.0001
-  -rw-r--r-- 1 foglamp foglamp 573080 Mar 23 17:54 foglamp-1.2-x86_64.deb
-  -rw-r--r-- 1 foglamp foglamp 572742 Mar 23 17:35 foglamp-1.2-x86_64.deb.0001
+  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:53 foglamp-1.6.0-x86_64
+  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:35 foglamp-1.6.0-x86_64.0001
+  -rw-r--r-- 1 foglamp foglamp 573080 Mar 23 17:54 foglamp-1.6.0-x86_64.deb
+  -rw-r--r-- 1 foglamp foglamp 572742 Mar 23 17:35 foglamp-1.6.0-x86_64.deb.0001
   $
    
 ... where the previous build is now marked with the suffix *.0001*.

make_deb

@@ -22,69 +22,49 @@
 
 set -e
 
-GIT_ROOT=`pwd`    # The script must be executed from the root git directory
-
-architecture="none"
-usage="$(basename "$0") {x86|arm|coral} [clean|cleanall]
+usage="$(basename "$0") [help|clean|cleanall]
 This script is used to create the Debian package of FogLAMP
 Arguments:
- x86      - Build an x86_64 package
- arm      - Build an armv7l package
- coral    - Build package for Google Coral board
+ help	  - Display this help text
  clean    - Remove all the old versions saved in format .XXXX
  cleanall - Remove all the versions, including the last one"
 
-if [ $# -gt 0 ]
-then
-    for i in "$@"
-    do
-      case "$i" in
-          x86)
-              architecture="x86_64"
-              shift
-              ;;
-          arm)
-              architecture="armhf"
-              shift
-              ;;
-          coral)
-              architecture="arm64"
-              shift
-              ;;
-          clean)
-              echo -n "Cleaning the build folder from older versions..."
-              find "${GIT_ROOT}/packages/Debian/build" -maxdepth 1 | grep '.*\.[0-9][0-9][0-9][0-9]' | xargs rm -rf
-              echo "Done."
-              shift
-              ;;
-          cleanall)
-              if [ -d "${GIT_ROOT}/packages/Debian/build" ]; then
-                echo -n "Cleaning the build folder..."
-                rm -rf ${GIT_ROOT}/packages/Debian/build/*
-                echo "Done."
-              else
-                echo "No build folder, skipping cleanall"
-              fi
-              shift
-              ;;
-          --help)
-              echo "${usage}"
-              exit 1
-              ;;
-          *)
-            echo "Unrecognized option: $i"
-            exit 1
-            ;;
-      esac
-    done
-else
-  echo "See help and select the architecture to use, *x86* or *arm*"
-fi
-
-# If the architecture has not been defined, then the script is complete
-if [[ "$architecture" == "none" ]]; then
-  exit 0
-fi
+GIT_ROOT=`pwd`
+architecture=`arch`
+
+for i in "$@"
+do
+  case "$i" in
+      clean)
+          if [ -d "${GIT_ROOT}/packages/Debian/build" ]; then
+            echo -n "Cleaning the build folder from older versions..."
+            find "${GIT_ROOT}/packages/Debian/build/${architecture}" -maxdepth 2 | grep '.*\.[0-9][0-9][0-9][0-9]' | xargs rm -rf
+            echo "Done."
+          else
+            echo "No build folder, skipping clean"
+          fi
+          exit 0
+          ;;
+      cleanall)
+          if [ -d "${GIT_ROOT}/packages/Debian/build" ]; then
+            echo -n "Cleaning the build folder..."
+            rm -rf ${GIT_ROOT}/packages/Debian/build
+            echo "Done."
+          else
+            echo "No build folder, skipping cleanall"
+          fi
+          exit 0
+          ;;
+      help)
+          echo "${usage}"
+          exit 1
+          ;;
+      *)
+        echo "Unrecognized option: $i"
+        exit 1
+        ;;
+  esac
+done
 
 # Check FOGLAMP_ROOT
 if [ -z ${FOGLAMP_ROOT+x} ]; then
@@ -99,7 +79,7 @@ if [ -z ${FOGLAMP_ROOT+x} ]; then
 fi
 
 version=`cat ${FOGLAMP_ROOT}/VERSION | tr -d ' ' | grep 'foglamp_version=' | head -1 | sed -e 's/\(.*\)=\(.*\)/\2/g'`
-BUILD_ROOT="${GIT_ROOT}/packages/Debian/build"
+BUILD_ROOT="${GIT_ROOT}/packages/Debian/build/${architecture}"
 
 # Final package name
 package_name="foglamp-${version}-${architecture}"
@@ -137,7 +117,7 @@ echo -n "Populating the package and updating version in control file..."
 cd "${package_name}"
 cp -R ${GIT_ROOT}/packages/Debian/common/* .
 cp -R ${GIT_ROOT}/packages/Debian/${architecture}/* .
-sed -i "s/Version: 1.0.0/Version: $version/g" DEBIAN/control
+sed -i "s/Version: 1.0.0/Version: ${version}/g" DEBIAN/control
 mkdir -p usr/local/foglamp
 cd usr/local/foglamp
 cp -R ${FOGLAMP_ROOT}/* .