From b7738ce69d996f7fea8a1547a32da4aa1cd9e9eb Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 5 Jun 2018 16:48:44 +0530 Subject: [PATCH 01/10] - moved the modules to there own separate folder. - added the welcomeStyle option in branding, explicitly --- .../calamares/bootloader-eficonfig/module.desc | 6 ------ .../calamares/branding/hamara/branding.desc | 5 +++-- .../calamares/mount-media-chroot/module.desc | 6 ------ .../calamares/scripts/bootloader-eficonfig | 13 ------------- .../calamares/scripts/mount-media-chroot | 13 ------------- .../calamares/scripts/sources-final | 12 ------------ .../calamares/scripts/sources-installtime | 11 ----------- .../calamares/scripts/unmount-media-chroot | 13 ------------- .../calamares/sources-final/module.desc | 5 ----- .../calamares/sources-installtime/module.desc | 5 ----- .../calamares/unmount-media-chroot/module.desc | 6 ------ 11 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 packages/calamares-settings-hamara/calamares/bootloader-eficonfig/module.desc delete mode 100644 packages/calamares-settings-hamara/calamares/mount-media-chroot/module.desc delete mode 100755 packages/calamares-settings-hamara/calamares/scripts/bootloader-eficonfig delete mode 100755 packages/calamares-settings-hamara/calamares/scripts/mount-media-chroot delete mode 100755 packages/calamares-settings-hamara/calamares/scripts/sources-final delete mode 100755 packages/calamares-settings-hamara/calamares/scripts/sources-installtime delete mode 100755 packages/calamares-settings-hamara/calamares/scripts/unmount-media-chroot delete mode 100644 packages/calamares-settings-hamara/calamares/sources-final/module.desc delete mode 100644 packages/calamares-settings-hamara/calamares/sources-installtime/module.desc delete mode 100644 packages/calamares-settings-hamara/calamares/unmount-media-chroot/module.desc diff --git a/packages/calamares-settings-hamara/calamares/bootloader-eficonfig/module.desc b/packages/calamares-settings-hamara/calamares/bootloader-eficonfig/module.desc deleted file mode 100644 index 13ed0f94..00000000 --- a/packages/calamares-settings-hamara/calamares/bootloader-eficonfig/module.desc +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: "job" -name: "bootloader-eficonfig" -interface: "process" -command: "/usr/sbin/bootloader-eficonfig" -timeout: 600 diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc index 25073d4a..90e41ce2 100644 --- a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc +++ b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc @@ -1,13 +1,14 @@ --- componentName: hamara +welcomeStyleCalamares: false strings: productName: Hamara Linux shortProductName: Hamara Linux version: 2 shortVersion: 2 - versionedName: Hamara Sugam 2.0 - shortVersionedName: Hamara Sugam 2.0 + versionedName: Hamara Sugam 2.0 + shortVersionedName: Hamara Sugam 2.0 bootloaderEntryName: Hamara Linux productUrl: https://hamaralinux.org supportUrl: https://forum.hamaralinux.org/ diff --git a/packages/calamares-settings-hamara/calamares/mount-media-chroot/module.desc b/packages/calamares-settings-hamara/calamares/mount-media-chroot/module.desc deleted file mode 100644 index 900d0aab..00000000 --- a/packages/calamares-settings-hamara/calamares/mount-media-chroot/module.desc +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: "job" -name: "mount-media-chroot" -interface: "process" -command: "/usr/sbin/mount-media-chroot" -chroot: false diff --git a/packages/calamares-settings-hamara/calamares/scripts/bootloader-eficonfig b/packages/calamares-settings-hamara/calamares/scripts/bootloader-eficonfig deleted file mode 100755 index a2ababbc..00000000 --- a/packages/calamares-settings-hamara/calamares/scripts/bootloader-eficonfig +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -if [ -d /sys/firmware/efi/efivars ]; then - echo " * Replacing grub-pc with grub-efi..." - # grub-probe doesn't work in a chroot... - mv $CHROOT/usr/sbin/grub-probe $CHROOT/usr/sbin/grub-probe.bak - echo "exit 0" > $CHROOT/usr/sbin/grub-probe - chmod +x $CHROOT/usr/sbin/grub-probe - chroot $CHROOT apt-get --allow-unauthenticated -y install grub-efi - mv -f $CHROOT/usr/sbin/grub-probe.bak $CHROOT/usr/sbin/grub-probe -fi diff --git a/packages/calamares-settings-hamara/calamares/scripts/mount-media-chroot b/packages/calamares-settings-hamara/calamares/scripts/mount-media-chroot deleted file mode 100755 index 19ad4709..00000000 --- a/packages/calamares-settings-hamara/calamares/scripts/mount-media-chroot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# This script runs on the live media, ie. outside of the chroot environment. - -# debian-live ensures that this is always at the same place, so we can just bind-mount it -MEDIA="/lib/live/mount/medium" - -# More tricky, we need to figure out where calamares left us the chroot. -# This seems to work reliably in all tested cases. -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -mkdir -p $CHROOT/media/installer -mount --bind $MEDIA $CHROOT/media/installer - diff --git a/packages/calamares-settings-hamara/calamares/scripts/sources-final b/packages/calamares-settings-hamara/calamares/scripts/sources-final deleted file mode 100755 index 4c00e91e..00000000 --- a/packages/calamares-settings-hamara/calamares/scripts/sources-final +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -cat < $CHROOT/etc/apt/sources.list -# Hamara Sugam Mirrors -deb http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free -deb-src http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free -# Debian Security Mirror -deb http://security.debian.org/debian-security testing/updates main -deb-src http://security.debian.org/debian-security testing/updates main -EOF diff --git a/packages/calamares-settings-hamara/calamares/scripts/sources-installtime b/packages/calamares-settings-hamara/calamares/scripts/sources-installtime deleted file mode 100755 index 8d5b9551..00000000 --- a/packages/calamares-settings-hamara/calamares/scripts/sources-installtime +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Note: relies on installation media being mounted on /media/usb - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -/bin/echo "#Hamara Desktop Installer" > $CHROOT/etc/apt/sources.list -/bin/echo "deb [trusted=yes] file:///media/installer namaste main" >> $CHROOT/etc/apt/sources.list - -chroot $CHROOT /usr/bin/apt-get update -exit 0 diff --git a/packages/calamares-settings-hamara/calamares/scripts/unmount-media-chroot b/packages/calamares-settings-hamara/calamares/scripts/unmount-media-chroot deleted file mode 100755 index 8001e63f..00000000 --- a/packages/calamares-settings-hamara/calamares/scripts/unmount-media-chroot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# This script runs on the live media, ie. outside of the chroot environment. - -# debian-live ensures that this is always at the same place, so we can just bind-mount it -MEDIA="/lib/live/mount/medium" - -# More tricky, we need to figure out where calamares left us the chroot. -# This seems to work reliably in all tested cases. -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -umount -l $CHROOT/media/installer -rmdir $CHROOT/media/installer - diff --git a/packages/calamares-settings-hamara/calamares/sources-final/module.desc b/packages/calamares-settings-hamara/calamares/sources-final/module.desc deleted file mode 100644 index cff6b2f4..00000000 --- a/packages/calamares-settings-hamara/calamares/sources-final/module.desc +++ /dev/null @@ -1,5 +0,0 @@ ---- -type: "job" -name: "sources-final" -interface: "process" -command: "/usr/sbin/sources-final" diff --git a/packages/calamares-settings-hamara/calamares/sources-installtime/module.desc b/packages/calamares-settings-hamara/calamares/sources-installtime/module.desc deleted file mode 100644 index 109ef5f3..00000000 --- a/packages/calamares-settings-hamara/calamares/sources-installtime/module.desc +++ /dev/null @@ -1,5 +0,0 @@ ---- -type: "job" -name: "sources-installtime" -interface: "process" -command: "/usr/sbin/sources-installtime" diff --git a/packages/calamares-settings-hamara/calamares/unmount-media-chroot/module.desc b/packages/calamares-settings-hamara/calamares/unmount-media-chroot/module.desc deleted file mode 100644 index a46afac4..00000000 --- a/packages/calamares-settings-hamara/calamares/unmount-media-chroot/module.desc +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: "job" -name: "unmount-media-chroot" -interface: "process" -command: "/usr/sbin/unmount-media-chroot" -chroot: false -- 2.17.1 From 2322546434867e8b85026076b09adbfa78d1309e Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 5 Jun 2018 16:50:02 +0530 Subject: [PATCH 02/10] correcting indentation --- .../calamares-settings-hamara/calamares/modules/welcome.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/calamares-settings-hamara/calamares/modules/welcome.conf b/packages/calamares-settings-hamara/calamares/modules/welcome.conf index 286ef837..1e2046a4 100644 --- a/packages/calamares-settings-hamara/calamares/modules/welcome.conf +++ b/packages/calamares-settings-hamara/calamares/modules/welcome.conf @@ -13,7 +13,7 @@ requirements: - power - internet - root - - screen + - screen required: - storage - ram -- 2.17.1 From 08d5ee8dcef3e35e75dc9b584afaf1a2bcbf51ba Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 5 Jun 2018 16:56:34 +0530 Subject: [PATCH 03/10] adding options as per the settings.conf from the calamares-settings-debian package --- packages/calamares-settings-hamara/calamares/settings.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/calamares-settings-hamara/calamares/settings.conf b/packages/calamares-settings-hamara/calamares/settings.conf index b3cc5fd7..929a4988 100644 --- a/packages/calamares-settings-hamara/calamares/settings.conf +++ b/packages/calamares-settings-hamara/calamares/settings.conf @@ -29,7 +29,7 @@ sequence: - partition - mount - unpackfs - - mount-media-chroot + - mount - sources-installtime - machineid - fstab @@ -43,7 +43,7 @@ sequence: - services - grubcfg - bootloader - - unmount-media-chroot + - unmount - sources-final - packages - initramfs -- 2.17.1 From df70f9055420c25b798af2e98f48a4d37f8344e0 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 5 Jun 2018 17:00:46 +0530 Subject: [PATCH 04/10] Newer package following the latest upstream settings package --- packages/calamares-settings-hamara/debian/changelog | 7 +++++++ packages/calamares-settings-hamara/debian/compat | 2 +- packages/calamares-settings-hamara/debian/control | 6 ++++-- packages/calamares-settings-hamara/debian/copyright | 4 ++-- packages/calamares-settings-hamara/debian/install | 12 ++---------- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/packages/calamares-settings-hamara/debian/changelog b/packages/calamares-settings-hamara/debian/changelog index 8b069621..22cbafca 100644 --- a/packages/calamares-settings-hamara/debian/changelog +++ b/packages/calamares-settings-hamara/debian/changelog @@ -1,3 +1,10 @@ +calamares-settings-hamara (201806) namaste; urgency=medium + + * Newer package following the changes in upstream + * paths for multiple modules have changed + + -- Raju Devidas Vindane Tue, 05 Jun 2018 16:59:02 +0530 + calamares-settings-hamara (201710) namaste; urgency=medium * Updates to the repo URLs in package to point to buster security repos diff --git a/packages/calamares-settings-hamara/debian/compat b/packages/calamares-settings-hamara/debian/compat index f599e28b..b4de3947 100644 --- a/packages/calamares-settings-hamara/debian/compat +++ b/packages/calamares-settings-hamara/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/packages/calamares-settings-hamara/debian/control b/packages/calamares-settings-hamara/debian/control index 3713aecf..ad6388ec 100644 --- a/packages/calamares-settings-hamara/debian/control +++ b/packages/calamares-settings-hamara/debian/control @@ -3,12 +3,14 @@ Section: utils Priority: optional Maintainer: Raju Devidas Build-Depends: debhelper (>=10) -Standards-Version: 4.1.3 +Standards-Version: 4.1.4 Homepage: https://hamaralinux.org Package: calamares-settings-hamara Architecture: all Depends: calamares, + cryptsetup, + keyutils, qml-module-qtquick-window2, qml-module-qtquick2, ${misc:Depends}, @@ -17,4 +19,4 @@ Description: Configuration for Calamares installer on Hamara Linux This package is intended for use along with calamares installer on a Hamara Linux live desktop. . This is used on live CD and USB images and is not intended for - installation on normal systems. \ No newline at end of file + installation on normal systems. diff --git a/packages/calamares-settings-hamara/debian/copyright b/packages/calamares-settings-hamara/debian/copyright index 991fc7e2..2c63dcf3 100644 --- a/packages/calamares-settings-hamara/debian/copyright +++ b/packages/calamares-settings-hamara/debian/copyright @@ -1,9 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: calamares-settings-hamara -Source: https://git.hamaralinux.org/libregeekingkid/calamares-settings-hamara +Source: https://git.hamaralinux.org/hamara-developers/hamara-packages/tree/hamara-sugam/packages/calamares-settings-hamara Files: * -Copyright (C) 2017 Raju Devidas +Copyright (C) 2018 Raju Devidas This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/packages/calamares-settings-hamara/debian/install b/packages/calamares-settings-hamara/debian/install index f8528c04..59b3bfe8 100644 --- a/packages/calamares-settings-hamara/debian/install +++ b/packages/calamares-settings-hamara/debian/install @@ -1,13 +1,5 @@ artwork/install-hamara-linux.png usr/share/pixmaps calamares etc/ -calamares/bootloader-eficonfig usr/lib/calamares/modules -calamares/mount-media-chroot usr/lib/calamares/modules -calamares/scripts/bootloader-eficonfig usr/sbin -calamares/scripts/mount-media-chroot usr/sbin -calamares/scripts/sources-final usr/sbin -calamares/scripts/sources-installtime usr/sbin -calamares/scripts/unmount-media-chroot usr/sbin -calamares/sources-final usr/lib/calamares/modules -calamares/sources-installtime usr/lib/calamares/modules -calamares/unmount-media-chroot usr/lib/calamares/modules +calamares-modules/* usr/lib/calamares/modules +scripts/* usr/sbin install-hamara-desktop.desktop usr/share/applications -- 2.17.1 From 13134ba2155a91360ff29906ef7e1b33bdca4982 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 5 Jun 2018 17:04:02 +0530 Subject: [PATCH 05/10] moved the modules and scripts to a different directory --- .../bootloader-eficonfig/module.desc | 6 ++++++ .../calamares-modules/sources-final/module.desc | 6 ++++++ .../sources-installtime/module.desc | 5 +++++ .../unmount-media-chroot/module.desc | 6 ++++++ .../install-hamara-desktop.desktop | 2 +- .../scripts/bootloader-eficonfig | 13 +++++++++++++ .../scripts/mount-media-chroot | 13 +++++++++++++ .../scripts/sources-final | 14 ++++++++++++++ .../scripts/sources-installtime | 11 +++++++++++ .../scripts/unmount-media-chroot | 13 +++++++++++++ 10 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 packages/calamares-settings-hamara/calamares-modules/bootloader-eficonfig/module.desc create mode 100644 packages/calamares-settings-hamara/calamares-modules/sources-final/module.desc create mode 100644 packages/calamares-settings-hamara/calamares-modules/sources-installtime/module.desc create mode 100644 packages/calamares-settings-hamara/calamares-modules/unmount-media-chroot/module.desc create mode 100755 packages/calamares-settings-hamara/scripts/bootloader-eficonfig create mode 100755 packages/calamares-settings-hamara/scripts/mount-media-chroot create mode 100755 packages/calamares-settings-hamara/scripts/sources-final create mode 100755 packages/calamares-settings-hamara/scripts/sources-installtime create mode 100755 packages/calamares-settings-hamara/scripts/unmount-media-chroot diff --git a/packages/calamares-settings-hamara/calamares-modules/bootloader-eficonfig/module.desc b/packages/calamares-settings-hamara/calamares-modules/bootloader-eficonfig/module.desc new file mode 100644 index 00000000..13ed0f94 --- /dev/null +++ b/packages/calamares-settings-hamara/calamares-modules/bootloader-eficonfig/module.desc @@ -0,0 +1,6 @@ +--- +type: "job" +name: "bootloader-eficonfig" +interface: "process" +command: "/usr/sbin/bootloader-eficonfig" +timeout: 600 diff --git a/packages/calamares-settings-hamara/calamares-modules/sources-final/module.desc b/packages/calamares-settings-hamara/calamares-modules/sources-final/module.desc new file mode 100644 index 00000000..4ff75eba --- /dev/null +++ b/packages/calamares-settings-hamara/calamares-modules/sources-final/module.desc @@ -0,0 +1,6 @@ +--- +type: "job" +name: "sources-final" +interface: "process" +command: "/usr/sbin/sources-final" +timeout: 600 diff --git a/packages/calamares-settings-hamara/calamares-modules/sources-installtime/module.desc b/packages/calamares-settings-hamara/calamares-modules/sources-installtime/module.desc new file mode 100644 index 00000000..109ef5f3 --- /dev/null +++ b/packages/calamares-settings-hamara/calamares-modules/sources-installtime/module.desc @@ -0,0 +1,5 @@ +--- +type: "job" +name: "sources-installtime" +interface: "process" +command: "/usr/sbin/sources-installtime" diff --git a/packages/calamares-settings-hamara/calamares-modules/unmount-media-chroot/module.desc b/packages/calamares-settings-hamara/calamares-modules/unmount-media-chroot/module.desc new file mode 100644 index 00000000..a46afac4 --- /dev/null +++ b/packages/calamares-settings-hamara/calamares-modules/unmount-media-chroot/module.desc @@ -0,0 +1,6 @@ +--- +type: "job" +name: "unmount-media-chroot" +interface: "process" +command: "/usr/sbin/unmount-media-chroot" +chroot: false diff --git a/packages/calamares-settings-hamara/install-hamara-desktop.desktop b/packages/calamares-settings-hamara/install-hamara-desktop.desktop index 7e6515e9..ef2c24f0 100644 --- a/packages/calamares-settings-hamara/install-hamara-desktop.desktop +++ b/packages/calamares-settings-hamara/install-hamara-desktop.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Install Hamara Sugam +Name=Install Hamara Sugam GenericName=System Installer Exec=sudo /usr/bin/calamares Comment=Calamares— Hamara Sugam Desktop Installer diff --git a/packages/calamares-settings-hamara/scripts/bootloader-eficonfig b/packages/calamares-settings-hamara/scripts/bootloader-eficonfig new file mode 100755 index 00000000..a2ababbc --- /dev/null +++ b/packages/calamares-settings-hamara/scripts/bootloader-eficonfig @@ -0,0 +1,13 @@ +#!/bin/bash + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +if [ -d /sys/firmware/efi/efivars ]; then + echo " * Replacing grub-pc with grub-efi..." + # grub-probe doesn't work in a chroot... + mv $CHROOT/usr/sbin/grub-probe $CHROOT/usr/sbin/grub-probe.bak + echo "exit 0" > $CHROOT/usr/sbin/grub-probe + chmod +x $CHROOT/usr/sbin/grub-probe + chroot $CHROOT apt-get --allow-unauthenticated -y install grub-efi + mv -f $CHROOT/usr/sbin/grub-probe.bak $CHROOT/usr/sbin/grub-probe +fi diff --git a/packages/calamares-settings-hamara/scripts/mount-media-chroot b/packages/calamares-settings-hamara/scripts/mount-media-chroot new file mode 100755 index 00000000..19ad4709 --- /dev/null +++ b/packages/calamares-settings-hamara/scripts/mount-media-chroot @@ -0,0 +1,13 @@ +#!/bin/bash +# This script runs on the live media, ie. outside of the chroot environment. + +# debian-live ensures that this is always at the same place, so we can just bind-mount it +MEDIA="/lib/live/mount/medium" + +# More tricky, we need to figure out where calamares left us the chroot. +# This seems to work reliably in all tested cases. +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +mkdir -p $CHROOT/media/installer +mount --bind $MEDIA $CHROOT/media/installer + diff --git a/packages/calamares-settings-hamara/scripts/sources-final b/packages/calamares-settings-hamara/scripts/sources-final new file mode 100755 index 00000000..72ca6157 --- /dev/null +++ b/packages/calamares-settings-hamara/scripts/sources-final @@ -0,0 +1,14 @@ +#!/bin/bash + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +cat < $CHROOT/etc/apt/sources.list +# Hamara Sugam Mirrors +deb http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free +deb-src http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free +# Debian Security Mirror +deb http://security.debian.org/debian-security testing/updates main +deb-src http://security.debian.org/debian-security testing/updates main +EOF + +exit 0 diff --git a/packages/calamares-settings-hamara/scripts/sources-installtime b/packages/calamares-settings-hamara/scripts/sources-installtime new file mode 100755 index 00000000..8d5b9551 --- /dev/null +++ b/packages/calamares-settings-hamara/scripts/sources-installtime @@ -0,0 +1,11 @@ +#!/bin/bash + +# Note: relies on installation media being mounted on /media/usb + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +/bin/echo "#Hamara Desktop Installer" > $CHROOT/etc/apt/sources.list +/bin/echo "deb [trusted=yes] file:///media/installer namaste main" >> $CHROOT/etc/apt/sources.list + +chroot $CHROOT /usr/bin/apt-get update +exit 0 diff --git a/packages/calamares-settings-hamara/scripts/unmount-media-chroot b/packages/calamares-settings-hamara/scripts/unmount-media-chroot new file mode 100755 index 00000000..8001e63f --- /dev/null +++ b/packages/calamares-settings-hamara/scripts/unmount-media-chroot @@ -0,0 +1,13 @@ +#!/bin/bash +# This script runs on the live media, ie. outside of the chroot environment. + +# debian-live ensures that this is always at the same place, so we can just bind-mount it +MEDIA="/lib/live/mount/medium" + +# More tricky, we need to figure out where calamares left us the chroot. +# This seems to work reliably in all tested cases. +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +umount -l $CHROOT/media/installer +rmdir $CHROOT/media/installer + -- 2.17.1 From 256c6b3d973b1132f638b5ab94364cc361572275 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 5 Jun 2018 21:35:21 +0530 Subject: [PATCH 06/10] adding extra module search paths --- packages/calamares-settings-hamara/calamares/settings.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/calamares-settings-hamara/calamares/settings.conf b/packages/calamares-settings-hamara/calamares/settings.conf index 929a4988..ed274077 100644 --- a/packages/calamares-settings-hamara/calamares/settings.conf +++ b/packages/calamares-settings-hamara/calamares/settings.conf @@ -3,7 +3,7 @@ --- # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules -modules-search: [ local ] +modules-search: [ local, /usr/lib/calamares/modules ] sequence: @@ -43,7 +43,6 @@ sequence: - services - grubcfg - bootloader - - unmount - sources-final - packages - initramfs -- 2.17.1 From abf6183b4b516b97c6b2e56137183d4421ca8372 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Wed, 6 Jun 2018 13:28:53 +0530 Subject: [PATCH 07/10] modifying the changelog to resolve build errors --- packages/calamares-settings-hamara/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/calamares-settings-hamara/debian/changelog b/packages/calamares-settings-hamara/debian/changelog index 22cbafca..dc158f13 100644 --- a/packages/calamares-settings-hamara/debian/changelog +++ b/packages/calamares-settings-hamara/debian/changelog @@ -1,4 +1,4 @@ -calamares-settings-hamara (201806) namaste; urgency=medium +calamares-settings-hamara (201805) namaste; urgency=medium * Newer package following the changes in upstream * paths for multiple modules have changed -- 2.17.1 From 0669cdadff4a557233f63aaef3bf38f910cff639 Mon Sep 17 00:00:00 2001 From: Raju Devidas Date: Wed, 13 Jun 2018 21:28:51 +0530 Subject: [PATCH 08/10] - adding support for software-properties-gtk configurations. - This would resolve bug #393 --- packages/hamara-sugam-config/Hamara.info | 12 ++++++++++++ packages/hamara-sugam-config/Hamara.mirrors | 1 + packages/hamara-sugam-config/debian/changelog | 6 ++++++ packages/hamara-sugam-config/debian/compat | 2 +- packages/hamara-sugam-config/debian/control | 4 ++-- packages/hamara-sugam-config/debian/install | 4 ++++ packages/hamara-sugam-config/hamara.csv | 2 ++ packages/hamara-sugam-config/lsb-release | 4 ++++ 8 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 packages/hamara-sugam-config/Hamara.info create mode 100644 packages/hamara-sugam-config/Hamara.mirrors create mode 100644 packages/hamara-sugam-config/hamara.csv create mode 100644 packages/hamara-sugam-config/lsb-release diff --git a/packages/hamara-sugam-config/Hamara.info b/packages/hamara-sugam-config/Hamara.info new file mode 100644 index 00000000..7242322d --- /dev/null +++ b/packages/hamara-sugam-config/Hamara.info @@ -0,0 +1,12 @@ +Suite: namaste +RepositoryType: deb +BaseURI: http://in.devel.hamaralinux.org/hamara-sugam +MatchURI: in.devel.hamaralinux.org/hamara-sugam +MirrorsFile: Hamara.mirrors +Description: Hamara Linux +Component: main +CompDescription: Officially supported +Component: contrib +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +CompDescription: Non-DFSG-compatible Software \ No newline at end of file diff --git a/packages/hamara-sugam-config/Hamara.mirrors b/packages/hamara-sugam-config/Hamara.mirrors new file mode 100644 index 00000000..be7607ad --- /dev/null +++ b/packages/hamara-sugam-config/Hamara.mirrors @@ -0,0 +1 @@ +http://in.devel.hamaralinux.org/hamara-sugam diff --git a/packages/hamara-sugam-config/debian/changelog b/packages/hamara-sugam-config/debian/changelog index 7d3c8cd1..40cecf6c 100644 --- a/packages/hamara-sugam-config/debian/changelog +++ b/packages/hamara-sugam-config/debian/changelog @@ -1,3 +1,9 @@ +hamara-sugam-config (1.1) namaste; urgency=medium + + * Adding support for software-properties-gtk configuration + + -- Raju Devidas Wed, 13 Jun 2018 21:25:46 +0530 + hamara-sugam-config (1.0) namaste; urgency=medium * Initial release (Closes: #nnnn) diff --git a/packages/hamara-sugam-config/debian/compat b/packages/hamara-sugam-config/debian/compat index ec635144..f599e28b 100644 --- a/packages/hamara-sugam-config/debian/compat +++ b/packages/hamara-sugam-config/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/packages/hamara-sugam-config/debian/control b/packages/hamara-sugam-config/debian/control index 862d82d7..43543e46 100644 --- a/packages/hamara-sugam-config/debian/control +++ b/packages/hamara-sugam-config/debian/control @@ -2,8 +2,8 @@ Source: hamara-sugam-config Section: hamara Priority: optional Maintainer: Sagar Ippalpalli -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10) +Standards-Version: 4.1.4 Homepage: https://git.hamaralinux.org/hamara-developers/hamara-packages Package: hamara-sugam-config diff --git a/packages/hamara-sugam-config/debian/install b/packages/hamara-sugam-config/debian/install index 6b3c8256..95cc0508 100644 --- a/packages/hamara-sugam-config/debian/install +++ b/packages/hamara-sugam-config/debian/install @@ -1 +1,5 @@ sources.list /etc/apt +Hamara.info /usr/share/python-apt/templates +Hamara.mirrors /usr/share/python-apt/templates +hamara.csv /usr/share/distro-info +lsb-release /etc \ No newline at end of file diff --git a/packages/hamara-sugam-config/hamara.csv b/packages/hamara-sugam-config/hamara.csv new file mode 100644 index 00000000..b14053ad --- /dev/null +++ b/packages/hamara-sugam-config/hamara.csv @@ -0,0 +1,2 @@ +version,codename,series,created,release,eol +2.0,Namaste,namaste,2018-06-05,2018-07-24,2021-06-09 \ No newline at end of file diff --git a/packages/hamara-sugam-config/lsb-release b/packages/hamara-sugam-config/lsb-release new file mode 100644 index 00000000..04e931fc --- /dev/null +++ b/packages/hamara-sugam-config/lsb-release @@ -0,0 +1,4 @@ +DISTRIB_ID=Hamara +DISTRIB_RELEASE=2.0 +DISTRIB_CODENAME=namaste +DISTRIB_DESCRIPTION="Hamara GNU/Linux" \ No newline at end of file -- 2.17.1 From eee0986080ff03d626ceb8aea29a295c1611cb59 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Thu, 14 Jun 2018 17:16:57 +0530 Subject: [PATCH 09/10] - Modified the structure of files in the calamares-settings-hamara package - Package was modified following the changes in the upstream calamares-settings-debian package. --- packages/calamares-settings-hamara/debian/changelog | 2 +- packages/calamares-settings-hamara/debian/compat | 2 +- packages/calamares-settings-hamara/debian/install | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/calamares-settings-hamara/debian/changelog b/packages/calamares-settings-hamara/debian/changelog index dc158f13..22cbafca 100644 --- a/packages/calamares-settings-hamara/debian/changelog +++ b/packages/calamares-settings-hamara/debian/changelog @@ -1,4 +1,4 @@ -calamares-settings-hamara (201805) namaste; urgency=medium +calamares-settings-hamara (201806) namaste; urgency=medium * Newer package following the changes in upstream * paths for multiple modules have changed diff --git a/packages/calamares-settings-hamara/debian/compat b/packages/calamares-settings-hamara/debian/compat index b4de3947..f599e28b 100644 --- a/packages/calamares-settings-hamara/debian/compat +++ b/packages/calamares-settings-hamara/debian/compat @@ -1 +1 @@ -11 +10 diff --git a/packages/calamares-settings-hamara/debian/install b/packages/calamares-settings-hamara/debian/install index 59b3bfe8..5746b8fd 100644 --- a/packages/calamares-settings-hamara/debian/install +++ b/packages/calamares-settings-hamara/debian/install @@ -1,5 +1,5 @@ -artwork/install-hamara-linux.png usr/share/pixmaps -calamares etc/ +calamares etc calamares-modules/* usr/lib/calamares/modules scripts/* usr/sbin install-hamara-desktop.desktop usr/share/applications +artwork/install-hamara-linux.png usr/share/pixmaps -- 2.17.1 From 5396c1f09fa1c7921731f4a881767544e8edbca5 Mon Sep 17 00:00:00 2001 From: Raju Devidas Date: Thu, 14 Jun 2018 18:56:40 +0530 Subject: [PATCH 10/10] following the instructions of Richard Stallman --- packages/hamara-sugam-config/Hamara.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hamara-sugam-config/Hamara.info b/packages/hamara-sugam-config/Hamara.info index 7242322d..32c7aabb 100644 --- a/packages/hamara-sugam-config/Hamara.info +++ b/packages/hamara-sugam-config/Hamara.info @@ -3,7 +3,7 @@ RepositoryType: deb BaseURI: http://in.devel.hamaralinux.org/hamara-sugam MatchURI: in.devel.hamaralinux.org/hamara-sugam MirrorsFile: Hamara.mirrors -Description: Hamara Linux +Description: Hamara GNU/Linux Component: main CompDescription: Officially supported Component: contrib -- 2.17.1