Browse code

Misc. changes

Jaidyn Levesque authored on 2019-10-16 16:03:04
Showing 3 changed files
1 1
similarity index 100%
2 2
rename from files/keys/libertybsd-67-package.pub
3 3
rename to files/keys/libertybsd-67-pkg.pub
... ...
@@ -42,8 +42,8 @@ blobs="$blobs zd1211-license zd1211b"
42 42
 
43 43
 for arch in $arch_list; do
44 44
 	for blob in $blobs; do
45
-		linedel "\${DESTDIR}/etc/firmware/${firmware}" \
46
-			"distrib/${arch}/ramdisk_cd/list.local"
45
+		linedel "/etc/firmware/${firmware}" \
46
+			"distrib/${arch}/ramdisk_cd/list"
47 47
 		linedel "./etc/firmware/$blob" \
48 48
 			"distrib/sets/lists/base/md.${arch}"
49 49
 	done
... ...
@@ -56,16 +56,16 @@ cdfs_list="amd64 i386"
56 56
 for arch in $(echo $cdfs_list);	do
57 57
 	rep "OpenBSD \${OSREV} ${arch} bootonly CD" \
58 58
 	    "LibertyBSD \${OSREV} ${arch} bootonly" \
59
-	    distrib/$arch/cdfs/Makefile
59
+	    distrib/$arch/ramdisk_cd/Makefile
60 60
 	rep "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
61 61
 	    "Copyright (c) `date +%Y` -OpenBSD- and LibertyBSD projects"  \
62
-	    distrib/$arch/cdfs/Makefile
62
+	    distrib/$arch/ramdisk_cd/Makefile
63 63
 	rep "Theo de Raadt <deraadt@openbsd.org>" \
64 64
 	    "Jaidyn Ann <jadedctrl@teknik.io>"    \
65
-	    distrib/$arch/cdfs/Makefile
65
+	    distrib/$arch/ramdisk_cd/Makefile
66 66
 	rep "OpenBSD/${arch}   \${OSREV} boot-only CD" \
67 67
 	    "LibertyBSD/${arch} \${OSREV} boot-only"   \
68
-	    distrib/$arch/cdfs/Makefile
68
+	    distrib/$arch/ramdisk_cd/Makefile
69 69
 done
70 70
 
71 71
 # --------------------------------------
... ...
@@ -97,12 +97,6 @@ filecp files/keys/libertybsd-64-base.pub etc/signify/libertybsd-64-base.pub
97 97
 filecp files/keys/libertybsd-64-pkg.pub etc/signify/libertybsd-64-pkg.pub
98 98
 filecp files/keys/libertybsd-64-syspatch.pub \
99 99
 	etc/signify/libertybsd-64-syspatch.pub
100
-filecp files/keys/libertybsd-65-base.pub \
101
-	etc/signify/libertybsd-65-base.pub
102
-filecp files/keys/libertybsd-65-syspatch.pub \
103
-	etc/signify/libertybsd-65-syspatch.pub
104
-filecp files/keys/libertybsd-65-pkg.pub \
105
-	etc/signify/libertybsd-65-pkg.pub
106 100
 filecp files/keys/libertybsd-66-base.pub etc/signify/libertybsd-66-base.pub
107 101
 filecp files/keys/libertybsd-66-pkg.pub etc/signify/libertybsd-66-pkg.pub
108 102
 filecp files/keys/libertybsd-66-syspatch.pub \