Bläddra i källkod

build-x86-images: rename to mkiso

classabbyamp 1 år sedan
förälder
incheckning
41ccf5e202
5 ändrade filer med 15 tillägg och 15 borttagningar
  1. 5 5
      Makefile
  2. 6 6
      README.md
  3. 3 3
      README.md.in
  4. 0 0
      mkiso.sh
  5. 1 1
      mklive.sh

+ 5 - 5
Makefile

@@ -34,16 +34,16 @@ COMPRESSOR_THREADS:=$(shell nproc)
 
 all:
 
-README.md: README.md.in build-x86-images.sh mklive.sh mkrootfs.sh mkplatformfs.sh mkimage.sh mknet.sh
+README.md: README.md.in mkiso.sh mklive.sh mkrootfs.sh mkplatformfs.sh mkimage.sh mknet.sh
 	printf '<!-- DO NOT EDIT, generated by make README.md -->\n\n' > README.md
 	cat README.md.in >> README.md
-	for script in build-x86-images mklive mkrootfs mkplatformfs mkimage mknet; do \
+	for script in mkiso mklive mkrootfs mkplatformfs mkimage mknet; do \
 		printf '### %s.sh\n\n```\n' "$${script}" >> README.md ; \
 		"./$${script}.sh" -h 2>/dev/null >> README.md ; \
 		printf '```\n\n' >> README.md ; \
 	done
 
-build-x86-images.sh: mklive.sh
+mkiso.sh: mklive.sh
 
 checksum: distdir-$(DATECODE)
 	cd distdir-$(DATECODE)/ && sha256 * > sha256sum.txt
@@ -59,9 +59,9 @@ live-iso-all: $(ALL_LIVE_ISO)
 live-iso-all-print:
 	@echo $(ALL_LIVE_ISO) | sed "s: :\n:g"
 
-void-live-%.iso: build-x86-images.sh
+void-live-%.iso: mkiso.sh
 	@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
-	$(SUDO) ./build-x86-images.sh -r $(REPOSITORY) -t $*
+	$(SUDO) ./mkiso.sh -r $(REPOSITORY) -t $*
 	@[ -n "${CI}" ] && printf '::endgroup::\n' || true
 
 rootfs-all: $(ALL_ROOTFS)

+ 6 - 6
README.md

@@ -7,8 +7,8 @@
 This repository contains several utilities:
 
 * [*mklive.sh*](#mklivesh) - The Void Linux live image generator for x86
-* [*build-x86-images.sh*](#build-x86-imagessh) - Wrapper script to generate bootable
-  and installable live images for x86
+* [*mkiso.sh*](#mkisosh) - Wrapper script to generate bootable and installable live
+  images for i686, x86_64, and aarch64.
 * [*mkrootfs.sh*](#mkrootfssh) - The Void Linux rootfs generator for all platforms
 * [*mkplatformfs.sh*](#mkplatformfssh) - The Void Linux filesystem tool to produce
   a rootfs for a particular platform
@@ -22,7 +22,7 @@ This repository contains several utilities:
 #### Generating x86 live ISOs
 
 To generate a live ISO like the officially-published ones, use
-[*build-x86-images.sh*](#build-x86-imagessh). To generate a more basic live ISO
+[*mkiso.sh*](#mkisosh). To generate a more basic live ISO
 (which does not include things like `void-installer`), use [*mklive.sh*](#mklivesh).
 
 #### Generating ROOTFS tarballs
@@ -90,10 +90,10 @@ that can change the behavior of the live system:
 
 ## Usage
 
-### build-x86-images.sh
+### mkiso.sh
 
 ```
-Usage: build-x86-images.sh [options ...] [-- mklive options ...]
+Usage: mkiso.sh [options ...] [-- mklive options ...]
 
 Wrapper script around mklive.sh for several standard flavors of live images.
 Adds void-installer and other helpful utilities to the generated images.
@@ -122,7 +122,7 @@ Usage: mklive.sh [options]
 Generates a basic live ISO image of Void Linux. This ISO image can be written
 to a CD/DVD-ROM or any USB stick.
 
-To generate a more complete live ISO image, use build-x86-images.sh.
+To generate a more complete live ISO image, use mkiso.sh.
 
 OPTIONS
  -a <arch>          Set XBPS_ARCH in the ISO image

+ 3 - 3
README.md.in

@@ -5,8 +5,8 @@
 This repository contains several utilities:
 
 * [*mklive.sh*](#mklivesh) - The Void Linux live image generator for x86
-* [*build-x86-images.sh*](#build-x86-imagessh) - Wrapper script to generate bootable
-  and installable live images for x86
+* [*mkiso.sh*](#mkisosh) - Wrapper script to generate bootable and installable live
+  images for i686, x86_64, and aarch64.
 * [*mkrootfs.sh*](#mkrootfssh) - The Void Linux rootfs generator for all platforms
 * [*mkplatformfs.sh*](#mkplatformfssh) - The Void Linux filesystem tool to produce
   a rootfs for a particular platform
@@ -20,7 +20,7 @@ This repository contains several utilities:
 #### Generating x86 live ISOs
 
 To generate a live ISO like the officially-published ones, use
-[*build-x86-images.sh*](#build-x86-imagessh). To generate a more basic live ISO
+[*mkiso.sh*](#mkisosh). To generate a more basic live ISO
 (which does not include things like `void-installer`), use [*mklive.sh*](#mklivesh).
 
 #### Generating ROOTFS tarballs

+ 0 - 0
build-x86-images.sh → mkiso.sh


+ 1 - 1
mklive.sh

@@ -72,7 +72,7 @@ usage() {
 	Generates a basic live ISO image of Void Linux. This ISO image can be written
 	to a CD/DVD-ROM or any USB stick.
 
-	To generate a more complete live ISO image, use build-x86-images.sh.
+	To generate a more complete live ISO image, use mkiso.sh.
 	
 	OPTIONS
 	 -a <arch>          Set XBPS_ARCH in the ISO image