From 56f1832c6d7fe2d2c21071ba9866242e536862d2 Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Fri, 13 Oct 2017 18:20:33 +0530
Subject: [PATCH 01/22] corrected the syntax

---
 mkbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mkbuild b/mkbuild
index 5ab1c59..6a69689 100755
--- a/mkbuild
+++ b/mkbuild
@@ -41,7 +41,7 @@ SETUP(){
 	done
 
 	#Copying live build scripts
-	if[$RELEASE == "hamara-sugam"]
+	if[ $RELEASE == "hamara-sugam" ]
 	then
 		cp -rv data/hamara-sugam/lb_scripts/*  /usr/lib/live/build/
 		echo " [Done]  Copying scripts for Hamara Sugam "
@@ -52,7 +52,7 @@ SETUP(){
 
 
 	#Replacing bootloader config files
-	if [$RELEASE == "hamara-sugam"]
+	if [ $RELEASE == "hamara-sugam" ]
 	then
 		rm -rf /usr/share/live/build/bootloaders
 		cp -r data/hamara-sugam/bootloaders /usr/share/live/build
-- 
2.17.1


From 94ed165b28362c5a2368e9f8953f100cb2a36a41 Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Fri, 13 Oct 2017 18:21:33 +0530
Subject: [PATCH 02/22] minor fix

---
 mkbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkbuild b/mkbuild
index 6a69689..a42e1da 100755
--- a/mkbuild
+++ b/mkbuild
@@ -41,7 +41,7 @@ SETUP(){
 	done
 
 	#Copying live build scripts
-	if[ $RELEASE == "hamara-sugam" ]
+	if [ $RELEASE == "hamara-sugam" ]
 	then
 		cp -rv data/hamara-sugam/lb_scripts/*  /usr/lib/live/build/
 		echo " [Done]  Copying scripts for Hamara Sugam "
-- 
2.17.1


From c743ca73a1d4aa31f307921a9565e590e3458e74 Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Sat, 21 Oct 2017 12:39:53 +0530
Subject: [PATCH 03/22] Adding configurations for build of svastik

---
 config.d/hamara/config/bootstrap              | 25 ++++++++++---------
 config.d/hamara/config/chroot                 |  3 ++-
 .../package-lists/additional.list.chroot      |  6 ++---
 .../lb_scripts/installer_debian-installer     |  2 +-
 hamara-svastik.conf                           |  8 +++---
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/config.d/hamara/config/bootstrap b/config.d/hamara/config/bootstrap
index 15a94b8..b5a4191 100644
--- a/config.d/hamara/config/bootstrap
+++ b/config.d/hamara/config/bootstrap
@@ -5,20 +5,20 @@
 LB_DISTRIBUTION="svastik"
 
 # $LB_PARENT_DISTRIBUTION: select parent distribution to use
-# (Default: svastik)
-LB_PARENT_DISTRIBUTION="svastik"
+# (Default: stretch)
+LB_PARENT_DISTRIBUTION="stretch"
 
 # $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
-# (Default: svastik)
+# (Default: stretch)
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="svastik"
 
 # $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_BOOTSTRAP="http://ftp.us.debian.org/debian"
 
 # $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_CHROOT="http://ftp.us.debian.org/debian"
 
 # $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
 # (Default: http://security.debian.org/)
@@ -26,23 +26,23 @@ LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_BINARY="http://ftp.us.debian.org/debian"
 
 # $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_BINARY_SECURITY="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org"
 
 # $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara"
 
 # $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_BOOTSTRAP="http://ftp.us.debian.org/debian"
 
 # $LB_MIRROR_CHROOT: set mirror to fetch packages from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_CHROOT="http://ftp.us.debian.org/debian"
 
 # $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
@@ -50,7 +50,7 @@ LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_BINARY: set mirror which ends up in the image
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_BINARY="http://devel.hamaralinux.org/hamara"
 
 # $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
@@ -58,7 +58,7 @@ LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara"
 
 # $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
 # (Default: )
@@ -71,3 +71,4 @@ LB_BOOTSTRAP_QEMU_EXCLUDE=""
 # $LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap
 # (Default: )
 LB_BOOTSTRAP_QEMU_STATIC=""
+
diff --git a/config.d/hamara/config/chroot b/config.d/hamara/config/chroot
index ad37338..ce14d75 100644
--- a/config.d/hamara/config/chroot
+++ b/config.d/hamara/config/chroot
@@ -14,7 +14,8 @@ LB_INTERACTIVE="false"
 
 # $LB_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LB_KEYRING_PACKAGES="hamara-keyring"
+#LB_KEYRING_PACKAGES="hamara-keyring"
+LB_KEYRING_PACKAGES="debian-keyring"
 
 # $LB_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
diff --git a/config.d/hamara/config/package-lists/additional.list.chroot b/config.d/hamara/config/package-lists/additional.list.chroot
index d1d51bc..f7ba671 100644
--- a/config.d/hamara/config/package-lists/additional.list.chroot
+++ b/config.d/hamara/config/package-lists/additional.list.chroot
@@ -1,6 +1,6 @@
 #Full Screen Support in VM
-virtualbox-guest-dkms
-virtualbox-guest-utils
+#virtualbox-guest-dkms
+#virtualbox-guest-utils
 #virtualbox-guest-x11
 
 aptitude
@@ -10,7 +10,7 @@ bluetooth
 brltty
 cheese
 cups
-firefox
+firefox-esr
 gparted
 gnome-disk-utility
 gnome-orca
diff --git a/data/hamara/lb_scripts/installer_debian-installer b/data/hamara/lb_scripts/installer_debian-installer
index 41985cd..5778f5b 100755
--- a/data/hamara/lb_scripts/installer_debian-installer
+++ b/data/hamara/lb_scripts/installer_debian-installer
@@ -488,7 +488,7 @@ then
 	# Generating deb indices
 	for _ARCHIVE_AREA in $(cd binary/pool && ls)
 	do
-		mkdir -p binary/dists/namaste/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}
+		mkdir -p binary/dists/svastik/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}
 
 		mv binary chroot/root
 		echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
diff --git a/hamara-svastik.conf b/hamara-svastik.conf
index 31d3687..8faa056 100755
--- a/hamara-svastik.conf
+++ b/hamara-svastik.conf
@@ -7,12 +7,12 @@ lb config --apt apt \
 		--bootloaders syslinux,grub-efi \
 		--compression gzip \
 		--debian-installer live \
-		--debian-installer-distribution svastik \
+		--debian-installer-distribution stretch \
 		--debian-installer-gui true \
 		--debootstrap-options "--keyring=/usr/share/keyrings/hamara-archive-keyring.gpg" \
 		--distribution svastik \
-		--parent-distribution svastik \
-		--parent-debian-installer-distribution svastik \
+		--parent-distribution stretch \
+		--parent-debian-installer-distribution stretch \
 		--firmware-binary true \
 		--firmware-chroot true \
 		--initramfs live-boot \
@@ -33,7 +33,7 @@ lb config --apt apt \
 		--parent-mirror-binary-updates http://ftp.us.debian.org/debian \
 		--parent-mirror-binary-backports http://ftp.us.debian.org/debian \
 		--parent-mirror-debian-installer http://ftp.us.debian.org/debian \
-		--mirror-bootstrap http://devel.hamaralinux.org/hamara \
+		--mirror-bootstrap http://ftp.us.debian.org/debian \
 		--mirror-chroot http://devel.hamaralinux.org/hamara \
 		--mirror-chroot-security http://security.debian.org \
 		--mirror-chroot-updates http://devel.hamaralinux.org/hamara \
-- 
2.17.1


From 9deb558602db290357d7d4c3dc3a838841d9c30a Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Mon, 30 Oct 2017 08:51:09 +0000
Subject: [PATCH 04/22] Add new file - Lets try to build the ISO in gitlab-ci
 via docker.

---
 .gitlab-ci.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..73f211e
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,22 @@
+# Is performed before the scripts in the stages step
+before_script:
+  - apt-get update
+  - apt-get -y upgrade
+
+# Defines stages which are to be executed
+stages:  
+  - buildiso
+
+# Stage "buildiso"
+run-build:  
+  stage: buildiso
+  script:
+    - apt-get install -y build-essential devscripts
+    - ./mkbuild iso amd64 devel.hamaralinux.org hamara-sugam beta
+    - mkdir build
+    - mv ../output build/
+
+# The files which are to be made available in GitLab
+  artifacts:
+    paths:
+      - build/*
-- 
2.17.1


From 71434147b355f987e9f162637de346372c12f5c0 Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Mon, 30 Oct 2017 09:24:16 +0000
Subject: [PATCH 05/22] Update .gitlab-ci.yml - adding debootstrap to the
 installation

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73f211e..c6a113f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ stages:
 run-build:  
   stage: buildiso
   script:
-    - apt-get install -y build-essential devscripts
+    - apt-get install -y build-essential devscripts binutil debootstrap git
     - ./mkbuild iso amd64 devel.hamaralinux.org hamara-sugam beta
     - mkdir build
     - mv ../output build/
-- 
2.17.1


From 354a475e951efdd3255b726e524bb13c5656e2f4 Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Mon, 30 Oct 2017 09:32:37 +0000
Subject: [PATCH 06/22] Update .gitlab-ci.yml - adding more packages to install
 and correcting the package name for binutils

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6a113f..442805f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ stages:
 run-build:  
   stage: buildiso
   script:
-    - apt-get install -y build-essential devscripts binutil debootstrap git
+    - apt-get install -y build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage
     - ./mkbuild iso amd64 devel.hamaralinux.org hamara-sugam beta
     - mkdir build
     - mv ../output build/
-- 
2.17.1


From 136b7fe5d61482f5ef01d498e3152cc66690cbdb Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Mon, 30 Oct 2017 11:09:10 +0000
Subject: [PATCH 07/22] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 442805f..fc13d93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@
 before_script:
   - apt-get update
   - apt-get -y upgrade
+  - apt-get -y install apt-utils
 
 # Defines stages which are to be executed
 stages:  
@@ -11,10 +12,10 @@ stages:
 run-build:  
   stage: buildiso
   script:
-    - apt-get install -y build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage
+    - apt-get install -y build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage 
     - ./mkbuild iso amd64 devel.hamaralinux.org hamara-sugam beta
     - mkdir build
-    - mv ../output build/
+    - mv output build/
 
 # The files which are to be made available in GitLab
   artifacts:
-- 
2.17.1


From dd0e8e9e3bf42899eb9d34ee2acae2a25a351c4b Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Mon, 30 Oct 2017 17:12:34 +0530
Subject: [PATCH 08/22] Added gnome software for installing applications

---
 .../hamara-sugam/config/package-lists/tools.list.chroot    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config.d/hamara-sugam/config/package-lists/tools.list.chroot b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
index 5b18403..28fd375 100644
--- a/config.d/hamara-sugam/config/package-lists/tools.list.chroot
+++ b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
@@ -66,3 +66,10 @@ xserver-xorg-input-synaptics
 xserver-xorg-input-multitouch
 xserver-xorg
 xserver-common
+
+
+
+# Adding GNOME Software center for installing applications
+gnome-software 
+gnome-software-plugin-flatpak
+gnome-software-plugin-limba
-- 
2.17.1


From 7eba588d22be95658af0ae0e81362d915731dc11 Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Mon, 30 Oct 2017 20:55:18 +0530
Subject: [PATCH 09/22] changing a few paths

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc13d93..2e78dc4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,4 +20,4 @@ run-build:
 # The files which are to be made available in GitLab
   artifacts:
     paths:
-      - build/*
+      - build/
-- 
2.17.1


From 5f02bd3833b72a136189100d3aa4326f01058fb3 Mon Sep 17 00:00:00 2001
From: rajudev <rajudev@disroot.org>
Date: Thu, 2 Nov 2017 14:22:42 +0530
Subject: [PATCH 10/22] Adding some common utilities to package lists

---
 .../hamara-sugam/config/package-lists/tools.list.chroot     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config.d/hamara-sugam/config/package-lists/tools.list.chroot b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
index 28fd375..925faf5 100644
--- a/config.d/hamara-sugam/config/package-lists/tools.list.chroot
+++ b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
@@ -73,3 +73,9 @@ xserver-common
 gnome-software 
 gnome-software-plugin-flatpak
 gnome-software-plugin-limba
+
+#Adding some common utils
+util-linux
+gdisk
+dosfstools
+
-- 
2.17.1


From f055ddad18ea69fb07a1703750bcbb12f3eb4b46 Mon Sep 17 00:00:00 2001
From: rajudev <rajudev@disroot.org>
Date: Thu, 2 Nov 2017 21:05:14 +0530
Subject: [PATCH 11/22] Keyboard layout map display in calamares installer

---
 config.d/hamara-sugam/config/package-lists/tools.list.chroot | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config.d/hamara-sugam/config/package-lists/tools.list.chroot b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
index 925faf5..6b9890c 100644
--- a/config.d/hamara-sugam/config/package-lists/tools.list.chroot
+++ b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
@@ -79,3 +79,5 @@ util-linux
 gdisk
 dosfstools
 
+#Keyboard layout display in Calamares
+console-setup
-- 
2.17.1


From a019632c0714feac851f0d2cdeb8648dde9728fa Mon Sep 17 00:00:00 2001
From: rajudev <rajudev@disroot.org>
Date: Fri, 3 Nov 2017 15:36:49 +0530
Subject: [PATCH 12/22] Adding gimp to the default list of packages.

---
 .../hamara-sugam/config/package-lists/desktop.list.chroot   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config.d/hamara-sugam/config/package-lists/desktop.list.chroot b/config.d/hamara-sugam/config/package-lists/desktop.list.chroot
index e4b7d3a..99cfa5f 100644
--- a/config.d/hamara-sugam/config/package-lists/desktop.list.chroot
+++ b/config.d/hamara-sugam/config/package-lists/desktop.list.chroot
@@ -16,4 +16,8 @@ materia-gtk-theme
 
 
 grub2
-grub-pc
\ No newline at end of file
+grub-pc
+
+#Multimedia
+gimp
+
-- 
2.17.1


From a5fa9a11a60a35f7644eca903e04b3c3afed3522 Mon Sep 17 00:00:00 2001
From: rajudev <rajudev@disroot.org>
Date: Fri, 3 Nov 2017 19:09:06 +0530
Subject: [PATCH 13/22] Adding proper printer support

---
 config.d/hamara-sugam/config/package-lists/tools.list.chroot | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config.d/hamara-sugam/config/package-lists/tools.list.chroot b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
index 6b9890c..f19e15f 100644
--- a/config.d/hamara-sugam/config/package-lists/tools.list.chroot
+++ b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
@@ -81,3 +81,8 @@ dosfstools
 
 #Keyboard layout display in Calamares
 console-setup
+
+#Support for printers
+system-config-printer
+
+
-- 
2.17.1


From d8e8486f97b170047a6447f6c7e928e18907d8a5 Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Fri, 3 Nov 2017 14:12:15 +0000
Subject: [PATCH 14/22] Update .gitlab-ci.yml adding a docker image specifier
 within the file and trying another attempt with artifacts

---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e78dc4..40e8f76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,8 @@
+image:
+    name: debian:stretch
+    entrypoint: ["--privileged"]
+
+
 # Is performed before the scripts in the stages step
 before_script:
   - apt-get update
@@ -20,4 +25,4 @@ run-build:
 # The files which are to be made available in GitLab
   artifacts:
     paths:
-      - build/
+      - "build"
-- 
2.17.1


From 5467697ae70a325b37ec1ac135183d16f8472c71 Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Fri, 3 Nov 2017 15:29:44 +0000
Subject: [PATCH 15/22] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40e8f76..3bfc99c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 image:
     name: debian:stretch
-    entrypoint: ["--privileged"]
+    entrypoint: ["--privileged "]
 
 
 # Is performed before the scripts in the stages step
@@ -24,5 +24,6 @@ run-build:
 
 # The files which are to be made available in GitLab
   artifacts:
-    paths:
-      - "build"
+    name: "hamara-sugam-2.0-build"
+    untracked: true
+    expire_in:1 weeks
-- 
2.17.1


From f3fb9a865a8658b7b3cc0e3636804946f34c9709 Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Fri, 3 Nov 2017 15:30:00 +0000
Subject: [PATCH 16/22] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bfc99c..4605b14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,4 +26,4 @@ run-build:
   artifacts:
     name: "hamara-sugam-2.0-build"
     untracked: true
-    expire_in:1 weeks
+    expire_in: 1 weeks
-- 
2.17.1


From 1bc5b1fdc0f5f16030f9c2161d9097612347d250 Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Fri, 3 Nov 2017 15:37:31 +0000
Subject: [PATCH 17/22] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4605b14..fa15eb3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 image:
     name: debian:stretch
-    entrypoint: ["--privileged "]
+    
 
 
 # Is performed before the scripts in the stages step
-- 
2.17.1


From e497b526dd469f8201a2a50ae3051df0489c7069 Mon Sep 17 00:00:00 2001
From: libregeekingkid <raju@hamaralinux.org>
Date: Fri, 3 Nov 2017 15:58:02 +0000
Subject: [PATCH 18/22] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa15eb3..cf19efd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,11 @@
 image:
     name: debian:stretch
     
-
-
 # Is performed before the scripts in the stages step
 before_script:
   - apt-get update
   - apt-get -y upgrade
-  - apt-get -y install apt-utils
+  - apt-get -y install apt-utils build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage 
 
 # Defines stages which are to be executed
 stages:  
@@ -17,10 +15,8 @@ stages:
 run-build:  
   stage: buildiso
   script:
-    - apt-get install -y build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage 
+    - apt-get install -y 
     - ./mkbuild iso amd64 devel.hamaralinux.org hamara-sugam beta
-    - mkdir build
-    - mv output build/
 
 # The files which are to be made available in GitLab
   artifacts:
-- 
2.17.1


From 7bb67587606454564f923b87bb9f31d7017f370a Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Fri, 5 Jan 2018 16:15:53 +0530
Subject: [PATCH 19/22] Added figlet for better debugging of steps

---
 mkbuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mkbuild b/mkbuild
index 0a5e8cd..6f9662f 100755
--- a/mkbuild
+++ b/mkbuild
@@ -24,6 +24,7 @@ SECONDS=0
 DATE=`date +%Y%m%d`
 
 SETUP(){
+	figlet SETUP
 	clear
 	cd $DIR
 	#Installing required packages
@@ -82,6 +83,7 @@ SETUP(){
 }
 
 CLEAN(){
+	figlet CLEAN
 	if [ -d "$DIR/build_area/$RELEASE-$ARCH" ]; then
 		#Change to target directory
 		cd $DIR/build_area/$RELEASE-$ARCH
@@ -95,6 +97,7 @@ CLEAN(){
 }
 
 BUILD(){
+	figlet BUILD
 	#creating build directory
 	mkdir -p $DIR/build_area/$RELEASE-$ARCH
 
@@ -128,6 +131,7 @@ BUILD(){
 	lb config --mirror-binary-security http://security.debian.org/
 
 	echo  " ----  Starting build  ---- "
+	figlet STARTING BUILD
 	lb build
 	if [ $? -eq 0 ];then
 		echo "[Done]  ISO Build successfully for $ARCH architecture "
-- 
2.17.1


From d3a6203827b048ed901b257640fbb835b6c7ad63 Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Thu, 25 Jan 2018 19:04:10 +0530
Subject: [PATCH 20/22] changed repos from in.devel to devel

---
 config.d/hamara-sugam/config/bootstrap | 36 +++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/config.d/hamara-sugam/config/bootstrap b/config.d/hamara-sugam/config/bootstrap
index 25e119b..d3558e0 100644
--- a/config.d/hamara-sugam/config/bootstrap
+++ b/config.d/hamara-sugam/config/bootstrap
@@ -13,52 +13,52 @@ LB_PARENT_DISTRIBUTION="namaste"
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="namaste"
 
 # $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_BOOTSTRAP="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_CHROOT="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_BINARY="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_BINARY_SECURITY="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_BINARY_SECURITY="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_BOOTSTRAP="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_CHROOT="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_BINARY="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
 LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
 # (Default: )
-- 
2.17.1


From 5e825b4faff5e235a60f2ea3f8b8c247ec0bddaa Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Thu, 25 Jan 2018 19:29:41 +0530
Subject: [PATCH 21/22] disabled backports as we are using testing

---
 mkbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkbuild b/mkbuild
index 6f9662f..12f6420 100755
--- a/mkbuild
+++ b/mkbuild
@@ -115,7 +115,7 @@ BUILD(){
 
 	#Setting parameters
 	lb config --architectures $ARCH
-	lb config --backports true
+	lb config --backports false
 	lb config --security true
 	lb config --parent-mirror-bootstrap http://$MIRROR/hamara-sugam
 	lb config --parent-mirror-chroot http://$MIRROR/hamara-sugam
-- 
2.17.1


From 0d825c43b3731757f605f35e9e874f7dbd7aabf7 Mon Sep 17 00:00:00 2001
From: Raju Vindane <raju@hamaralinux.org>
Date: Fri, 26 Jan 2018 17:58:20 +0530
Subject: [PATCH 22/22] - changing security repo from stretch to buster -
 adding figlet at places for better debugging.

---
 config.d/hamara/config/binary                    |  1 +
 config.d/hamara/config/bootstrap                 |  1 +
 data/hamara-sugam/lb_scripts/bootstrap_archives  |  4 ++--
 data/hamara-sugam/lb_scripts/chroot_archives     | 16 ++++++++--------
 .../lb_scripts/installer_debian-installer        |  2 +-
 mkbuild                                          |  2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config.d/hamara/config/binary b/config.d/hamara/config/binary
index 0b6b47e..c31b10d 100644
--- a/config.d/hamara/config/binary
+++ b/config.d/hamara/config/binary
@@ -1,3 +1,4 @@
+figlet BUILDOPTIONS
 # config/binary - options for live-build(7), binary stage
 
 # $LB_BINARY_FILESYSTEM: set image filesystem
diff --git a/config.d/hamara/config/bootstrap b/config.d/hamara/config/bootstrap
index b5a4191..1ccfa26 100644
--- a/config.d/hamara/config/bootstrap
+++ b/config.d/hamara/config/bootstrap
@@ -1,3 +1,4 @@
+figlet BOOTSTRAP
 # config/bootstrap - options for live-build(7), bootstrap stage
 
 # $LB_DISTRIBUTION: select distribution to use
diff --git a/data/hamara-sugam/lb_scripts/bootstrap_archives b/data/hamara-sugam/lb_scripts/bootstrap_archives
index 73c9ff0..61b46fc 100755
--- a/data/hamara-sugam/lb_scripts/bootstrap_archives
+++ b/data/hamara-sugam/lb_scripts/bootstrap_archives
@@ -97,11 +97,11 @@ then
 					;;
 
 				*)
-					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 
 					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 					then
-						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 					fi
 					;;
 			esac
diff --git a/data/hamara-sugam/lb_scripts/chroot_archives b/data/hamara-sugam/lb_scripts/chroot_archives
index d781da0..8a2f94b 100755
--- a/data/hamara-sugam/lb_scripts/chroot_archives
+++ b/data/hamara-sugam/lb_scripts/chroot_archives
@@ -98,11 +98,11 @@ EOF
 							;;
 
 						*)
-							echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+							echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+								echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 							fi
 							;;
 					esac
@@ -118,11 +118,11 @@ EOF
 					else
 						if [ "${LB_DERIVATIVE}" = "true" ]
 						then
-							echo "deb ${LB_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+							echo "deb ${LB_MIRROR_CHROOT_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+								echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 							fi
 						fi
 					fi
@@ -587,11 +587,11 @@ EOF
 							;;
 
 						*)
-							echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+							echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+								echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 							fi
 							;;
 					esac
@@ -607,11 +607,11 @@ EOF
 					else
 						if [ "${LB_DERIVATIVE}" = "true" ]
 						then
-							echo "deb ${LB_MIRROR_BINARY_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+							echo "deb ${LB_MIRROR_BINARY_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_MIRROR_BINARY_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+								echo "deb-src ${LB_MIRROR_BINARY_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 							fi
 						fi
 					fi
diff --git a/data/hamara-sugam/lb_scripts/installer_debian-installer b/data/hamara-sugam/lb_scripts/installer_debian-installer
index cebab61..9b2ee46 100755
--- a/data/hamara-sugam/lb_scripts/installer_debian-installer
+++ b/data/hamara-sugam/lb_scripts/installer_debian-installer
@@ -269,7 +269,7 @@ case "${LB_DERIVATIVE}" in
 		then
 			# FIXME: normal derivatives probably don't rebuild d-i,
 			# but progress-linux does.
-			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/stretch/main/installer-${LB_ARCHITECTURES}/current/images/"
+			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/buster/main/installer-${LB_ARCHITECTURES}/current/images/"
 		fi
 		;;
 esac
diff --git a/mkbuild b/mkbuild
index 6f9662f..f57af48 100755
--- a/mkbuild
+++ b/mkbuild
@@ -33,7 +33,7 @@ SETUP(){
 	echo " ###############################################"
 	echo " ----  Installing packages  ----  "
 
-	for PKG in apt-cacher-ng debootstrap live-build
+	for PKG in apt-cacher-ng debootstrap live-build figlet 
 	do
 	  dpkg -s $PKG &> /dev/null
 	  if [ $? -eq 1 ];then
-- 
2.17.1