updated mkbuild script and added new live hooks

live-sugam/config/binary

@@ -22,7 +22,7 @@ LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nom
 
 # $LB_BOOTLOADERS: set bootloaders
 # (Default: grub-pc)
-LB_BOOTLOADERS="syslinux"
+LB_BOOTLOADERS="syslinux,grub-efi"
 
 # $LB_CHECKSUMS: set checksums
 # (Default: md5)
@@ -34,7 +34,7 @@ LB_COMPRESSION="none"
 
 # $LB_ZSYNC: set zsync
 # (Default: false)
-LB_ZSYNC="false"
+LB_ZSYNC="true"
 
 # ${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted
 # (Default: true)
@@ -43,7 +43,7 @@ LB_BUILD_WITH_CHROOT="true"
 
 # $LB_DEBIAN_INSTALLER: set debian-installer
 # (Default: true)
-LB_DEBIAN_INSTALLER="true"
+LB_DEBIAN_INSTALLER="live"
 
 # $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
 # (Default: empty)
@@ -63,7 +63,7 @@ LB_GRUB_SPLASH=""
 
 # $LB_HDD_LABEL: set hdd label
 # (Default: DEBIAN_LIVE)
-LB_HDD_LABEL="DEBIAN_LIVE"
+LB_HDD_LABEL="HAMARA_SUGAM_LIVE"
 
 # $LB_HDD_SIZE: set hdd filesystem size
 # (Default: auto)
@@ -75,7 +75,7 @@ LB_HDD_PARTITION_START=""
 
 # $LB_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LB_ISO_APPLICATION="Debian Live"
+LB_ISO_APPLICATION="Hamara Sugam Live"
 
 # $LB_ISO_PREPARER: set iso preparer
 # (Default: live-build 1:20161216; http://live-systems.org/devel/live-build)
@@ -87,7 +87,7 @@ LB_ISO_PUBLISHER="Live Systems project; http://live-systems.org/; debian-live@li
 
 # $LB_ISO_VOLUME: set iso volume (max 32 chars)
 # (Default: Debian stretch 20170104-14:07)
-LB_ISO_VOLUME="Debian stretch 20170104-14:07"
+LB_ISO_VOLUME="Hamara Sugam namaste "
 
 # $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
 # (Default: unset)

live-sugam/config/build

@@ -6,5 +6,5 @@ Mirror-Bootstrap: http://devel.hamaralinux.org/hamara-sugam
 
 [FIXME]
 Configuration-Version: 1:20161216
-Name: hamara-sugam-live
+Name: Hamara-Sugam-Live
 Type: iso-hybrid

live-sugam/config/hooks/live/0060-update-schemas.hook.chroot

+#!/bin/sh
+
+set -e
+
+glib-compile-schemas /usr/share/glib-2.0/schemas/

live-sugam/config/includes.chroot/usr/share/glib-2.0/schemas/live-boot.gschema.override

+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+

live-sugam/config/includes.chroot/usr/share/mate-panel/layouts/hamara.layout

+[Toplevel top]
+expand=true
+orientation=top
+size=24
+
+[Toplevel bottom]
+expand=true
+orientation=bottom
+size=24
+
+[Object mate-menu]
+object-type=applet
+applet-iid=MateMenuAppletFactory::MateMenuApplet
+toplevel-id=top
+position=0
+locked=true
+
+[Object installer]
+locked=true
+position=10
+launcher-location=/usr/share/applications/debian-installer-launcher.desktop
+toplevel-id=top
+object-type=launcher
+menu-path=applications:/
+
+[Object dockapplet]
+locked=false
+position=20
+panel-right-stick=false
+toplevel-id=top
+applet-iid=DockAppletFactory::DockApplet
+object-type=applet
+
+[Object notification-area]
+object-type=applet
+applet-iid=NotificationAreaAppletFactory::NotificationArea
+toplevel-id=top
+position=10
+panel-right-stick=true
+locked=true
+
+[Object clock]
+object-type=applet
+applet-iid=ClockAppletFactory::ClockApplet
+toplevel-id=top
+position=0
+panel-right-stick=true
+locked=true
+
+[Object shutdown]
+action-type=shutdown
+object-type=action
+position=0
+panel-right-stick=true
+toplevel-id=top
+locked=true
+
+
+[Object show-desktop]
+object-type=applet
+applet-iid=WnckletFactory::ShowDesktopApplet
+toplevel-id=bottom
+position=0
+locked=true
+
+[Object window-list]
+object-type=applet
+applet-iid=WnckletFactory::WindowListApplet
+toplevel-id=bottom
+position=20
+locked=true
+
+[Object workspace-switcher]
+object-type=applet
+applet-iid=WnckletFactory::WorkspaceSwitcherApplet
+toplevel-id=bottom
+position=0
+panel-right-stick=true
+locked=true

live-sugam/config/package-lists/grub.list.chroot

+grub2

live-sugam/config/package-lists/installer.list.chroot

 debian-installer-launcher
-grub2
\ No newline at end of file

mkbuild

@@ -26,11 +26,10 @@ fi
 
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DATE=`date +%Y-%m-%d`
 
 
 SETUP(){
-
+	cd $DIR
 	#Installing required packages
 	echo  -e " ---- \e[1;36m Installing packages \033[0m ----  "
 	apt-get install -y apt-cacher-ng debootstrap
@@ -77,28 +76,53 @@ CLEAN(){
 }
 
 BUILD(){
+
 	#creating build directory
 	mkdir -p $DIR/build_area/$ARCH
 	#copying config files
-	cp -r live-sugam/* $DIR/build_area/$ARCH
+	cp -r $DIR/live-sugam/* $DIR/build_area/$ARCH/
 	#changing directory
-	cd $DIR/build_area/$ARCH
+	cd $DIR/build_area/$ARCH/
 
 	#Setting parameters
 	lb config --architectures $ARCH
-	lb config --parent-mirror-chroot $MIRROR/hamara-sugam
-	lb config --parent-mirror-binary $MIRROR/hamara-sugam
-	lb config --mirror-bootstrap $MIRROR/hamara-sugam
-	lb config --mirror-chroot $MIRROR/hamara-sugam
-	lb config --mirror-binary $MIRROR/hamara-sugam
-	lb config --mirror-debian-installer $MIRROR/hamara-sugam
+	lb config --security false
+	lb config --parent-mirror-bootstrap http://$MIRROR/hamara-sugam
+	lb config --parent-mirror-chroot http://$MIRROR/hamara-sugam
+	lb config --parent-mirror-binary http://$MIRROR/hamara-sugam
+	lb config --parent-mirror-debian-installer http://$MIRROR/hamara-sugam
+	lb config --mirror-bootstrap http://$MIRROR/hamara-sugam
+	lb config --mirror-chroot http://$MIRROR/hamara-sugam
+	lb config --mirror-binary http://$MIRROR/hamara-sugam
+	lb config --mirror-debian-installer http://$MIRROR/hamara-sugam
 
 	echo -e  " ---- \e[4;36m Starting build \033[0m ---- "
 	lb build
 	if [ $? -eq 0 ]; then
 		echo -e "\e[0;32m[Done]\033[0m  ISO Build successfully for $ARCH architecture "
 
-		mv -v $DIR/build_area/$ARCH/*.iso ISO/Hamara-Sugam-Live-pre_alpha-$ARCH-$DATE.iso
+		for i in *.iso  *.contents *.packages *.zsync
+		do
+			mv -v $i $DIR/ISO/$ARCH/
+		done
+
+		cd $DIR/ISO/$ARCH
+		mv -v *.iso hamara-sugam-live-pre_alpha-$ARCH.iso
+		mv -v *.contents hamara-sugam-live-pre_alpha-$ARCH.contents
+		mv -v *.packages hamara-sugam-live-pre_alpha-$ARCH.packages
+		mv -v *.zsync hamara-sugam-live-pre_alpha-$ARCH.iso.zsync
+
+
+		#calculating sha1sum
+		echo -e " ____ Calculating CHECKSUM ___ "
+		for i in *.iso  *.contents *.packages *.zsync
+		do
+			for j in 1 256 512
+			do
+				echo "Generating SHA"$j"SUM "
+				sha"$j"sum $i >> SHA"$j"SUMS
+			done
+		done
 
 		echo -e  " \e[0;33m  ----  Now, test your ISO  ---- \033[0m "
 		echo -e "\033[36m" Tip : "\e[1;39m Make bootable USB stick with Etcher "
@@ -116,8 +140,8 @@ HELP(){
   echo " iso ARCH       --   builds ISO . (ARCH -> amd64,i386,all) "
   echo " clean ARCH     --   cleans building area. (ARCH -> amd64,i386) "
   echo " full-clean     --   removes cache directory after cleaning building area. "
-  echo " Usage example  --   ./mkbuild iso amd64 $MIRROR"
-  echo "                     ./mkbuild clean i386 $MIRROR"
+  echo " Usage example  --   ./mkbuild iso amd64 MIRROR"
+  echo "                     ./mkbuild clean i386 MIRROR"
   echo "		--   Mirrors -> devel.hamaralinux.org"
   echo "		--	     -> in.devel.hamaralinux.org"
 }
@@ -134,7 +158,6 @@ iso)
 			case $3 in
 				in.devel.hamaralinux.org|devel.hamaralinux.org)
 				MIRROR=$3
-				cd $DIR
 				SETUP
 				CLEAN
 				BUILD
@@ -150,7 +173,6 @@ iso)
 			case $3 in
 				in.devel.hamaralinux.org|devel.hamaralinux.org)
 				MIRROR=$3
-				cd $DIR
 				SETUP
 				CLEAN
 				BUILD
@@ -165,11 +187,11 @@ iso)
 			case $3 in
 				in.devel.hamaralinux.org|devel.hamaralinux.org)
 				MIRROR=$3
-				cd $DIR
 				SETUP
-				for ARCH in amd64,i386
+				for ARCH in amd64 i386
 				do
-					CLEAN BUILD
+					CLEAN
+					BUILD
 				done
 				;;
 				*)
@@ -218,4 +240,3 @@ clean-all)
 
 esac
 
-exit 0