diff options
-rw-r--r-- | Makefile | 34 | ||||
-rwxr-xr-x | initramfs-tools/hooks/samizdat | 2 | ||||
-rwxr-xr-x | src/initrd.sh | 4 | ||||
-rwxr-xr-x | src/keygen.sh | 2 | ||||
-rw-r--r-- | src/samizdat-paths.sh | 19 | ||||
-rw-r--r-- | src/xorriso-usb.sh | 2 |
6 files changed, 30 insertions, 33 deletions
@@ -1,26 +1,20 @@ | |||
1 | PACKAGE=samizdat-rhizome | ||
2 | prefix=/usr/local | ||
3 | exec_prefix=${prefix} | ||
4 | bindir=${exec_prefix}/bin | ||
5 | # libdir=${exec_prefix}/lib | ||
6 | # includedir=${prefix}/include | ||
7 | # datarootdir=${prefix}/share | ||
8 | # datadir=${datarootdir} | ||
9 | # mandir=${datarootdir}/man | ||
10 | # infodir=${datarootdir}/info | ||
11 | # docdir=${datarootdir}/doc/${PACKAGE} | ||
12 | # sysconfdir=$(prefix)/etc | ||
13 | # libexecdir=$(exec_prefix)/libexec | ||
14 | |||
15 | all: | 1 | all: |
16 | @echo unimplemented | 2 | @echo unimplemented |
17 | 3 | ||
18 | bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh samizdat-paths.sh qemu.sh) | 4 | bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh samizdat-paths.sh qemu.sh) |
19 | data_files= | ||
20 | libexec_programs= | ||
21 | 5 | ||
22 | install: | 6 | initrd_files:=$(wildcard src/initrd/*) |
23 | install ${bin_programs} ${bindir} | 7 | initramfs_conf_files:=$(wildcard initramfs-tools/*) |
24 | 8 | ||
25 | # install ${libexec_programs} ${libexecdir} | 9 | include src/samizdat-paths.sh |
26 | # install ${data_files} ${datadir}/${PACKAGE} | 10 | |
11 | install: | ||
12 | install ${bin_programs} ${samizdat_bindir} | ||
13 | mkdir -p ${samizdat_initrd_files_dir} | ||
14 | mkdir -p ${samizdat_child_dir} | ||
15 | mkdir -p ${samizdat_grub_efi_dir} | ||
16 | mkdir -p ${samizdat_initramfs_conf_dir} | ||
17 | mkdir -p ${samizdat_isolinux_dir} | ||
18 | mkdir -p ${samizdat_linux_dir} | ||
19 | cp -r ${initrd_files} ${samizdat_initrd_files_dir} | ||
20 | cp -r ${initramfs_conf_files} ${samizdat_initramfs_conf_dir} | ||
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat index db2fd1c..c02b8c6 100755 --- a/initramfs-tools/hooks/samizdat +++ b/initramfs-tools/hooks/samizdat | |||
@@ -8,8 +8,6 @@ CopyExec() { copy_exec "$@" || exit 1; } | |||
8 | PATH=/usr/local/bin:$PATH | 8 | PATH=/usr/local/bin:$PATH |
9 | . samizdat-paths.sh | 9 | . samizdat-paths.sh |
10 | 10 | ||
11 | set -x | ||
12 | |||
13 | repo_execs=$(echo "${samizdat_initrd_files_dir}"/*) | 11 | repo_execs=$(echo "${samizdat_initrd_files_dir}"/*) |
14 | 12 | ||
15 | path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus' | 13 | path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus' |
diff --git a/src/initrd.sh b/src/initrd.sh index 0bc1ed7..5c3013a 100755 --- a/src/initrd.sh +++ b/src/initrd.sh | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | . samizdat-paths.sh | 3 | . samizdat-paths.sh |
4 | 4 | ||
5 | initrd=${samizdat_isolinux_dir}/linux/initrd.img | 5 | initrd=${samizdat_linux_dir}/initrd.img |
6 | vmlinuz=${samizdat_isolinux_dir}/linux/vmlinuz | 6 | vmlinuz=${samizdat_linux_dir}/vmlinuz |
7 | 7 | ||
8 | version=$(uname -r) | 8 | version=$(uname -r) |
9 | version=4.5.0-0.bpo.1-amd64 | 9 | version=4.5.0-0.bpo.1-amd64 |
diff --git a/src/keygen.sh b/src/keygen.sh index 801010a..f952cec 100755 --- a/src/keygen.sh +++ b/src/keygen.sh | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | gpg_set_ultimate_trust() | 3 | gpg_set_ultimate_trust() |
4 | { | 4 | { |
5 | local keygrip d | 5 | local keygrip |
6 | keygrip=$(gpg -K --with-colons --with-fingerprint --with-fingerprint|sed -ne '/^sec/{n;p;q}'|cut -d: -f10) | 6 | keygrip=$(gpg -K --with-colons --with-fingerprint --with-fingerprint|sed -ne '/^sec/{n;p;q}'|cut -d: -f10) |
7 | printf '%s:6:\n' "$keygrip" | gpg2 --import-ownertrust | 7 | printf '%s:6:\n' "$keygrip" | gpg2 --import-ownertrust |
8 | } | 8 | } |
diff --git a/src/samizdat-paths.sh b/src/samizdat-paths.sh index 94c4312..fc6468d 100644 --- a/src/samizdat-paths.sh +++ b/src/samizdat-paths.sh | |||
@@ -1,8 +1,13 @@ | |||
1 | samizdat_initrd_files_dir=/home/d/sami/src/initrd | 1 | # Note: this file is both shell script and make file |
2 | samizdat_libdir=/usr/local/lib/samizdat-rhizome | ||
3 | samizdat_bindir=/usr/local/bin | ||
4 | |||
5 | samizdat_initrd_files_dir=${samizdat_libdir}/initrd | ||
6 | samizdat_child_dir=${samizdat_libdir}/child | ||
7 | samizdat_isolinux_dir=${samizdat_libdir}/isolinux | ||
8 | samizdat_linux_dir=${samizdat_libdir}/isolinux/linux | ||
9 | samizdat_grub_efi_dir=${samizdat_libdir}/grub-efi | ||
10 | samizdat_initramfs_conf_dir=${samizdat_libdir}/initramfs-tools | ||
11 | |||
12 | samizdat_iso_dir=. | ||
2 | samizdat_execs_dir=/home/d/src/samizdat | 13 | samizdat_execs_dir=/home/d/src/samizdat |
3 | samizdat_child_dir=/home/d/sami/child | ||
4 | samizdat_isolinux_dir=/home/d/sami/isolinux | ||
5 | samizdat_grub_efi_dir=/home/d/sami/grub-efi | ||
6 | samizdat_iso_dir=/home/d/sami | ||
7 | samizdat_initramfs_conf_dir=/home/d/sami/initramfs-tools | ||
8 | PATH=/usr/local/samizdat/bin:${PATH} | ||
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh index 7ff9825..01fd436 100644 --- a/src/xorriso-usb.sh +++ b/src/xorriso-usb.sh | |||
@@ -6,7 +6,7 @@ outdev= | |||
6 | volid=SamizdatLive | 6 | volid=SamizdatLive |
7 | gpg_iso_path=gnupghome | 7 | gpg_iso_path=gnupghome |
8 | gnupghome= | 8 | gnupghome= |
9 | child_dir=$samizdat_child_dir | 9 | child_dir=$samizdat_child_dir/child.$$ |
10 | vmlinuz_dir=$samizdat_isolinux_dir | 10 | vmlinuz_dir=$samizdat_isolinux_dir |
11 | efi_dir=$samizdat_grub_efi_dir | 11 | efi_dir=$samizdat_grub_efi_dir |
12 | 12 | ||