Rick/web
1
0
Fork 0
Code Issues Pull requests Activity

add patches

Browse source
This commit is contained in:
rick 2023-10-25 16:36:53 +02:00
parent ca0817ae99
commit f7cd31b357
Signed by: Rick
GPG key ID: 5CBE8779CD27BCBA
7 changed files with 121 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -5,6 +5,7 @@ COPY header.html .
COPY footer.html .
COPY img/ img/
COPY css/ css/
COPY patches/ patches/
COPY lang/ lang/
COPY generate.sh .

2
generate.sh
View file

@ -23,7 +23,7 @@ set -e
# liste des fichiers html à générer
langDir="lang"
tmpHeader="/tmp/header.html"
annexes="css img"
annexes="css img patches"
pathLinks="/home/site/a/"
target="www"

1
lang/en/header.link
View file

@ -6,6 +6,7 @@ rick's website
where.html : where to find me
friends.html : friends & co
projects.html : projects
patches.html : patches
#a/ : annuaire
rss.html : my rss feeds
others.html : others

35
lang/en/patches.html Normal file
View file

@ -0,0 +1,35 @@
%link%
rel="stylesheet" href="/css/projets.css"
%endlink%
<div id="main">
<p>You can find here a list of patches which I've written on some softwares. They are small and/or only fix some issues for me. If they are integrated or become useless (because of an update), they will be removed from this page.</p>
<div class="tableau">
<table>
<thead>
<tr>
<th>Software</th>
<th>Patch description</th>
<th>Patch</th>
</tr>
</thead>
<tbody>
<tr>
<td><a href="https://github.com/lxc/distrobuilder">distrobuilder</a></td>
<td>Use <code>mkisofs</code> instead of <code>genisoimage</code>.</td>
<td><a href="/patches/distrobuilder-mkisofs.patch"><code>distrobuilder-mkisofs.patch</code></a></td>
</tr>
<!--
<tr>
<td><a href=""></a></td>
<td></td>
<td><a href="/patches/"></a></td>
</tr>
-->
</tbody>
</table>
</div>
</div>

1
lang/fr/header.link
View file

@ -6,6 +6,7 @@ le site de rick
ou.html : où me retrouver
copaings.html : copains & co
projets.html : projets
patches.html : patches
#a/ : annuaire
rss.html : mes flux rss
autres.html : autres

35
lang/fr/patches.html Normal file
View file

@ -0,0 +1,35 @@
%link%
rel="stylesheet" href="/css/projets.css"
%endlink%
<div id="main">
<p>Vous pouvez retrouver ici une liste de patches que j'ai pu faire sur différents logiciels. Ils sont minimes ou ne règlent un problème qui ne concerne que moi. S'ils sont intégrés dans le logiciel ou deviennent inutiles, ils seront supprimés de cette page.</p>
<div class="tableau">
<table>
<thead>
<tr>
<th>Logiciel</th>
<th>Description du patch</th>
<th>Patch</th>
</tr>
</thead>
<tbody>
<tr>
<td><a href="https://github.com/lxc/distrobuilder">distrobuilder</a></td>
<td>Utilisation de <code>mkisofs</code> au lieu de <code>genisoimage</code>.</td>
<td><a href="/patches/distrobuilder-mkisofs.patch"><code>distrobuilder-mkisofs.patch</code></a></td>
</tr>
<!--
<tr>
<td><a href=""></a></td>
<td></td>
<td><a href="/patches/"></a></td>
</tr>
-->
</tbody>
</table>
</div>
</div>

47
patches/distrobuilder-mkisofs.patch Normal file
View file

@ -0,0 +1,47 @@
From 91ab435f54d1665e5f5c0497568ae7985c6b8b38 Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Wed, 25 Oct 2023 15:49:14 +0200
Subject: [PATCH] change genisoimage for mkisofs
---
distrobuilder/main_repack-windows.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/distrobuilder/main_repack-windows.go b/distrobuilder/main_repack-windows.go
index 76735f2..cbeae34 100644
--- a/distrobuilder/main_repack-windows.go
+++ b/distrobuilder/main_repack-windows.go
@@ -327,17 +327,17 @@ func (c *cmdRepackWindows) run(cmd *cobra.Command, args []string, overlayDir str
logger.Info("Generating new ISO")
var stdout strings.Builder
- err = shared.RunCommand(c.global.ctx, nil, &stdout, "genisoimage", "--version")
+ err = shared.RunCommand(c.global.ctx, nil, &stdout, "mkisofs", "--version")
if err != nil {
- return fmt.Errorf("Failed to determine version of genisoimage: %w", err)
+ return fmt.Errorf("Failed to determine version of mkisofs: %w", err)
}
version := strings.Split(stdout.String(), "\n")[0]
if strings.HasPrefix(version, "mkisofs") {
- err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+ err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
} else {
- err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "--allow-limited-size", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+ err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
}
if err != nil {
@@ -413,7 +413,7 @@ func (c *cmdRepackWindows) modifyWim(path string, index int) error {
}
func (c *cmdRepackWindows) checkDependencies() error {
- dependencies := []string{"genisoimage", "hivexregedit", "rsync", "wimlib-imagex"}
+ dependencies := []string{"mkisofs", "hivexregedit", "rsync", "wimlib-imagex"}
for _, dep := range dependencies {
_, err := exec.LookPath(dep)
--
2.42.0