freedom-maker: update patches for newer release

This commit is contained in:
Luis Guzmán 2024-10-15 09:52:42 +00:00
parent fe099af6d1
commit 19cdc0e545
8 changed files with 284 additions and 270 deletions

View file

@ -31,16 +31,16 @@ index aaa7caa..293545b 100644
| target | description |
|-----------------------|-------------|
@@ -46,25 +42,18 @@ Freedom-maker supports building for the following targets:
| *pine64-plus* | Pine64+ board's SD card |
| *qemu-amd64* | 64-bit image for the Qemu virtualization tool |
| *qemu-i386* | 32-bit image for the Qemu virtualization tool |
-| *raspberry2* | RasbperryPi 2's SD card |
-| *raspberry3* | RasbperryPi 3's SD card |
-| *raspberry3-b-plus* | RasbperryPi 3 Model B+'s SD card |
-| *test* | build virtualbox i386 image and run diagnostics tests on it
-| *virtualbox-amd64* | 64-bit image for the VirtualBox virtualization tool |
-| *virtualbox-i386* | 32-bit image for the VirtualBox virtualization tool |
@@ -42,25 +42,18 @@ Trisquel Freedom-maker supports building for the following targets:
| *pine64-plus* | Pine64+ board's SD card |
| *qemu-amd64* | 64-bit image for the Qemu virtualization tool |
| *qemu-i386* | 32-bit image for the Qemu virtualization tool |
-| *raspberry2* | RasbperryPi 2's SD card |
-| *raspberry3* | RasbperryPi 3's SD card |
-| *raspberry3-b-plus* | RasbperryPi 3 Model B+'s SD card |
-| *raspberry64* | Single image for Raspberry Pi 3B, Raspberry Pi 3B+ and Raspberry Pi 4B |
-| *virtualbox-amd64* | 64-bit image for the VirtualBox virtualization tool |
-| *virtualbox-i386* | 32-bit image for the VirtualBox virtualization tool |
## Running Build
@ -53,7 +53,7 @@ index aaa7caa..293545b 100644
2. Install the required dependencies:
```shell
$ sudo apt install btrfs-progs debootstrap kpartx parted qemu-user-static qemu-utils sshpass
$ sudo apt install binfmt-support btrfs-progs debootstrap dmsetup dosfstools fdisk git kpartx parted psmisc qemu-user-static qemu-utils sshpass sudo u-boot-tools xz-utils
- $ cd freedom-maker
- $ sudo apt build-dep .
+ $ sudo apt build-dep freedom-maker
@ -68,47 +68,69 @@ index aaa7caa..293545b 100644
$ sudo python3 -m freedommaker <TARGET>
```
where: &lt;TARGET&gt; is one of the 'Supported Targets' above.
diff --git a/debian/freedom-maker.1 b/debian/freedom-maker.1
index 71a9a9b..58051f3 100644
--- a/debian/freedom-maker.1
+++ b/debian/freedom-maker.1
@@ -51,17 +51,17 @@ Size of the image to build
.PP
\fB\-\-build\-mirror\fR
.RS 4
-Debian mirror to use for building
+Trisquel mirror to use for building
.RE
.PP
\fB\-\-mirror\fR
.RS 4
-Debian mirror to use in built image
+Trisquel mirror to use in built image
.RE
.PP
\fB\-\-distribution\fR
.RS 4
-Debian release to use in built image
+Trisquel release to use in built image
.RE
.PP
\fB\-\-package\fR
@@ -101,7 +101,7 @@ Force rebuild of images even when required image exists
.PP
\fBtargets\fR
.RS 4
-Image targets to build\&. Choose one or more of a20\-olinuxino\-lime, a20\-olinuxino\-lime2, a20\-olinuxino\-micro, amd64, arm64, armhf, banana\-pro, beaglebone, cubieboard2, cubietruck, i386, lamobo\-r1, orange\-pi\-zero, pcduino3, pine64\-lts, pine64\-plus, qemu\-amd64, qemu\-i386, raspberry2, raspberry3, raspberry3\-b\-plus, test, virtualbox\-amd64, virtualbox\-i386
+Image targets to build\&. Choose one or more of freedommaker, dreamplug, beaglebone, cubieboard2, cubietruck, a20\-olinuxino\-lime, a20\-olinuxino\-lime2, a20\-olinuxino\-micro, i386, amd64, qemu\-i386, qemu\-amd64, pcDuino3
.RE
.SH "EXAMPLES"
.PP
@@ -128,8 +128,7 @@ Build a FreedomBox image for the BeagleBone Single Board Computer\&.
$ freedommaker a20\-olinuxino\-lime a20\-olinuxino\-lime2
a20\-olinuxino\-micro amd64 arm64 armhf banana\-pro beaglebone cubieboard2
cubietruck i386 lamobo\-r1 orange\-pi\-zero pcduino3 pine64\-lts pine64\-plus
- qemu\-amd64 qemu\-i386 raspberry2 raspberry3 raspberry3\-b\-plus test
- virtualbox\-amd64 virtualbox\-i386
+ qemu\-amd64 qemu\-i386
.fi
.if n \{\
.RE
diff --git a/doc/freedom-maker.xml b/doc/freedom-maker.xml
index 09c2f001..8c4abdd6 100644
--- a/doc/freedom-maker.xml
+++ b/doc/freedom-maker.xml
@@ -85,7 +85,7 @@
<term> <option>--build-mirror</option></term>
<listitem>
<para>
- Debian mirror to use for building
+ Trisquel mirror to use for building
</para>
</listitem>
</varlistentry>
@@ -93,7 +93,7 @@
<term> <option>--mirror</option></term>
<listitem>
<para>
- Debian mirror to use in built image
+ Trisquel mirror to use in built image
</para>
</listitem>
</varlistentry>
@@ -101,15 +101,7 @@
<term> <option>--distribution</option></term>
<listitem>
<para>
- Debian release to use in built image
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--add-release-component</option></term>
- <listitem>
- <para>
- Add an extra Debian release component (other than main)
+ Trisquel release to use in built image
</para>
</listitem>
</varlistentry>
@@ -208,12 +200,10 @@
<term> <option>targets</option></term>
<listitem>
<para>
- Image targets to build. Choose one or more of a20-olinuxino-lime,
- a20-olinuxino-lime2, a20-olinuxino-micro, amd64, arm64, armhf,
- banana-pro, beaglebone, cubieboard2, cubietruck, i386, lamobo-r1,
- orange-pi-zero, pcduino3, pine64-lts, pine64-plus, qemu-amd64,
- qemu-i386, raspberry2, raspberry3, raspberry3-b-plus, raspberry64,
- vagrant virtualbox-amd64, virtualbox-i386
+ Image targets to build. Choose one or more of freedommaker,
+ dreamplug, beaglebone, cubieboard2, cubietruck,
+ a20-olinuxino-lime,a20-olinuxino-lime2, a20-olinuxino-micro,
+ i386, amd64, qemu-i386, qemu-amd64, pcDuino3
</para>
</listitem>
</varlistentry>
@@ -236,8 +226,7 @@
<synopsis>$ freedommaker a20-olinuxino-lime a20-olinuxino-lime2
a20-olinuxino-micro amd64 arm64 armhf banana-pro beaglebone cubieboard2
cubietruck i386 lamobo-r1 orange-pi-zero pcduino3 pine64-lts pine64-plus
- qemu-amd64 qemu-i386 raspberry2 raspberry3 raspberry3-b-plus raspberry64
- vagrant virtualbox-amd64 virtualbox-i386</synopsis>
+ qemu-amd64 qemu-i386</synopsis>
<para>
Build all the available FreedomBox images using freedom-maker.
</para>