From d342e7ed223ee7c3c42c402b3eaca990e20a053c Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sun, 14 Apr 2024 00:12:53 -0600 Subject: Rework not not have imworkingon stuff in the top-level --- .gitignore | 2 +- Makefile | 2 +- cmd/generate/main.go | 10 +++---- contribs.yml | 70 ----------------------------------------------- go.mod | 2 +- imworkingon/contribs.yml | 70 +++++++++++++++++++++++++++++++++++++++++++++++ imworkingon/tags.yml | 27 ++++++++++++++++++ imworkingon/upstreams.yml | 29 ++++++++++++++++++++ tags.yml | 27 ------------------ upstreams.yml | 29 -------------------- 10 files changed, 134 insertions(+), 134 deletions(-) delete mode 100644 contribs.yml create mode 100644 imworkingon/contribs.yml create mode 100644 imworkingon/tags.yml create mode 100644 imworkingon/upstreams.yml delete mode 100644 tags.yml delete mode 100644 upstreams.yml diff --git a/.gitignore b/.gitignore index 02a5081..8c6db60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/imworkingon.html +/public/imworkingon.html diff --git a/Makefile b/Makefile index b3095ec..0f15fd5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -imworkingon.html: FORCE +public/imworkingon.html: FORCE go run ./cmd/generate .PHONY: FORCE diff --git a/cmd/generate/main.go b/cmd/generate/main.go index 85f452e..ab6409a 100644 --- a/cmd/generate/main.go +++ b/cmd/generate/main.go @@ -36,15 +36,15 @@ func main() { var htmlTmplStr string func mainWithError() error { - contribs, err := ReadContribs("contribs.yml") + contribs, err := ReadContribs("imworkingon/contribs.yml") if err != nil { return err } - tags, err := ReadTags("tags.yml") + tags, err := ReadTags("imworkingon/tags.yml") if err != nil { return err } - upstreams, err := ReadUpstreams("upstreams.yml") + upstreams, err := ReadUpstreams("imworkingon/upstreams.yml") if err != nil { return err } @@ -53,7 +53,7 @@ func mainWithError() error { return contribs[i].SubmittedAt.After(contribs[j].SubmittedAt) }) - tmpl := template.Must(template.New("imworkingon.html"). + tmpl := template.Must(template.New("imworkingon.html.tmpl"). Funcs(template.FuncMap{ "md2html": MarkdownToHTML, "getUpstream": func(c Contribution) Upstream { @@ -83,7 +83,7 @@ func mainWithError() error { }); err != nil { return err } - if err := os.WriteFile("imworkingon.html", out.Bytes(), 0666); err != nil { + if err := os.WriteFile("public/imworkingon.html", out.Bytes(), 0666); err != nil { return err } return nil diff --git a/contribs.yml b/contribs.yml deleted file mode 100644 index 6620ea7..0000000 --- a/contribs.yml +++ /dev/null @@ -1,70 +0,0 @@ -- urls: [https://github.com/flori/json/pull/567] - tags: [Ruby, JSON, SoftwareFreedom] - desc: | - ruby-json contains code that is not Free under the FSF's - definition, not Open Source under the OSI's definition, and not - GPL-compatible. This has coused much consternation among folks - who care about any of those 3 things. - - This PR replaces that non-Free code with Free code, removing - friction for Ruby users on GNU/Linux distros that care about those - 3 things. -- urls: [https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/328] - tags: [ARM] - sponsored-by: Umorpha Systems - desc: | - To do its work, mkinitcpio needs to know the version number of the - Linux kernel that it is generating an image for; the normal way - that it knows this is to sniff the version number from the kernel - file. However, it fails to sniff the version number from ARM - zImage kernels, which means that Arch Linux ARM and Parabola for - ARM need to resort to hacks to get mkinitcpio to work right. - - This PR removes that friction by teaching mkinitcpio to understand - ARM zImage files. -- urls: [https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/277] - sponsored-by: Umorpha Systems - desc: | - One of the things going on in the secure-boot world is moving - toward "Unified Kernel Images" (UKI), which are when the kernel - and the init-ramdisk are bundled together into a single file to - reduce the risk of a compromised init-ramdisk being able to - compromise a secured kernel. This PR reduces friction when using - mkinitcpio to generate images directly as UKI without generating a - plain init-ramdisk first. -- urls: - - https://mailman.astron.com/pipermail/file/2024-April/001335.html - - https://github.com/file/file/commit/cf139abf35d07ebfd0c3edcab2fc400a211c0fbb - tags: [ARM] - desc: | - This PR improves its ability to detect information about Linux - kernel ARM zImage files. -- urls: - - https://mailman.astron.com/pipermail/file/2024-March/001327.html - - https://github.com/file/file/commit/3b92878ee277a6b6c0a37429e9edf5e5b55fcdd4 - tags: [docs] - desc: | - To do this, `file` reads a "magic" file that describes the magic - numbers that it might see in a file. This PR fixes a mistake in - the `magic(5)` manual for writing such files. -- urls: [https://github.com/diamondburned/gotk4/pull/140] - tags: [GI, docs] - desc: | - The not-quite-markdown format that `.gir` files use for - documentation is under-specified and hard to parse. Right now I'm - focusing on how to properly parse it, so that we can have - top-notch language-specific documentation for GI libraries. - - This PR is laying the groundwork for the new parser. -- urls: - - https://lists.ozlabs.org/pipermail/linux-erofs/2023-November/009765.html - - https://github.com/erofs/erofs-utils/commit/f528b82ffbcb15484a7195c1a1d08ece0ff67350 - - https://github.com/erofs/erofs-utils/commit/197e3294bcdf93f37d12989cd830a33c055b1a53 - - https://github.com/erofs/erofs-utils/commit/f97311883337eb7e0ded55e60995e6599eba73e5 - tags: [docs] - sponsored-by: Umorpha Systems - desc: | - This patchset improves the `--help` documentation and man-pages - the EroFS userspace tools, and reduces friction by having - `fsck.erofs` accept common command line flags that fsck - implementions for other filesystems take. diff --git a/go.mod b/go.mod index 4bcd940..6557c06 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.lukeshu.com/imworkingon +module git.lukeshu.com/www go 1.22.2 diff --git a/imworkingon/contribs.yml b/imworkingon/contribs.yml new file mode 100644 index 0000000..6620ea7 --- /dev/null +++ b/imworkingon/contribs.yml @@ -0,0 +1,70 @@ +- urls: [https://github.com/flori/json/pull/567] + tags: [Ruby, JSON, SoftwareFreedom] + desc: | + ruby-json contains code that is not Free under the FSF's + definition, not Open Source under the OSI's definition, and not + GPL-compatible. This has coused much consternation among folks + who care about any of those 3 things. + + This PR replaces that non-Free code with Free code, removing + friction for Ruby users on GNU/Linux distros that care about those + 3 things. +- urls: [https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/328] + tags: [ARM] + sponsored-by: Umorpha Systems + desc: | + To do its work, mkinitcpio needs to know the version number of the + Linux kernel that it is generating an image for; the normal way + that it knows this is to sniff the version number from the kernel + file. However, it fails to sniff the version number from ARM + zImage kernels, which means that Arch Linux ARM and Parabola for + ARM need to resort to hacks to get mkinitcpio to work right. + + This PR removes that friction by teaching mkinitcpio to understand + ARM zImage files. +- urls: [https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/277] + sponsored-by: Umorpha Systems + desc: | + One of the things going on in the secure-boot world is moving + toward "Unified Kernel Images" (UKI), which are when the kernel + and the init-ramdisk are bundled together into a single file to + reduce the risk of a compromised init-ramdisk being able to + compromise a secured kernel. This PR reduces friction when using + mkinitcpio to generate images directly as UKI without generating a + plain init-ramdisk first. +- urls: + - https://mailman.astron.com/pipermail/file/2024-April/001335.html + - https://github.com/file/file/commit/cf139abf35d07ebfd0c3edcab2fc400a211c0fbb + tags: [ARM] + desc: | + This PR improves its ability to detect information about Linux + kernel ARM zImage files. +- urls: + - https://mailman.astron.com/pipermail/file/2024-March/001327.html + - https://github.com/file/file/commit/3b92878ee277a6b6c0a37429e9edf5e5b55fcdd4 + tags: [docs] + desc: | + To do this, `file` reads a "magic" file that describes the magic + numbers that it might see in a file. This PR fixes a mistake in + the `magic(5)` manual for writing such files. +- urls: [https://github.com/diamondburned/gotk4/pull/140] + tags: [GI, docs] + desc: | + The not-quite-markdown format that `.gir` files use for + documentation is under-specified and hard to parse. Right now I'm + focusing on how to properly parse it, so that we can have + top-notch language-specific documentation for GI libraries. + + This PR is laying the groundwork for the new parser. +- urls: + - https://lists.ozlabs.org/pipermail/linux-erofs/2023-November/009765.html + - https://github.com/erofs/erofs-utils/commit/f528b82ffbcb15484a7195c1a1d08ece0ff67350 + - https://github.com/erofs/erofs-utils/commit/197e3294bcdf93f37d12989cd830a33c055b1a53 + - https://github.com/erofs/erofs-utils/commit/f97311883337eb7e0ded55e60995e6599eba73e5 + tags: [docs] + sponsored-by: Umorpha Systems + desc: | + This patchset improves the `--help` documentation and man-pages + the EroFS userspace tools, and reduces friction by having + `fsck.erofs` accept common command line flags that fsck + implementions for other filesystems take. diff --git a/imworkingon/tags.yml b/imworkingon/tags.yml new file mode 100644 index 0000000..8e0fa2d --- /dev/null +++ b/imworkingon/tags.yml @@ -0,0 +1,27 @@ +docs: + prettyName: Documentation + desc: | + I'm working to improve documentation for GNU/Linux, but more than + that I'm working to improve the forms of documentation that more + skilled technical writers might be afraid or incapable of working + on: `--help` text, generated documentation, and auditing + documentation against the source code to make sure that it is + accurate and complete. +ARM: + prettyName: ARM support + desc: | + Not that folks can't use GNU/Linux on ARM (obviously, the + Raspberry Pi has been a huge success), but there's still a lot + more friction to using GNU/Linux on ARM compared to x86. I'm + working on that. +GI: + prettyName: GObject Introspection + desc: | + GObject Introspection (which is a terrible name for what it is, + btw) is a cross-(language-runtime) object system. GObject was an + object system for C that game out of GTK+, and then GObject + Introspection was created as a way to specify the ABI for working + with an object, so that GObjects could be used from other + languages. I think that GObject Introspection is a really cool + technology that can be the basis of reducing friction between + languages, but it needs better/more-ubiquitous tooling. diff --git a/imworkingon/upstreams.yml b/imworkingon/upstreams.yml new file mode 100644 index 0000000..7dc0d70 --- /dev/null +++ b/imworkingon/upstreams.yml @@ -0,0 +1,29 @@ +- urls: [https://github.com/flori/json] + name: ruby-json + desc: | + Ruby's standard JSON gem (which comes bundled with the core Ruby + distribution!). +- urls: [https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio] + desc: | + The `mkinitcpio` tool generates init-ramdisk images to boot + GNU/Linux systems. +- urls: + - https://www.darwinsys.com/file/ + - https://mailman.astron.com/pipermail/file/ + - https://github.com/file/file + desc: | + The `file` tool sniffs a file to tell you about the file's + format. +- urls: + - https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git + - https://github.com/erofs/erofs-utils + desc: | + EROFS is the Enhanced Read-Only File System, a successor to + SquashFS. +- urls: [https://github.com/diamondburned/gotk4] + desc: | + gotk4 is a project that burries the lede: yes, it is a set of Go + bindings to GTK4. But (IMO) more interestingly, + `./gir/cmd/gir-generate` is a tool for generating Go bindings to + GObject Introspection (GI) libraries from the `.gir` files + describing the library. diff --git a/tags.yml b/tags.yml deleted file mode 100644 index 8e0fa2d..0000000 --- a/tags.yml +++ /dev/null @@ -1,27 +0,0 @@ -docs: - prettyName: Documentation - desc: | - I'm working to improve documentation for GNU/Linux, but more than - that I'm working to improve the forms of documentation that more - skilled technical writers might be afraid or incapable of working - on: `--help` text, generated documentation, and auditing - documentation against the source code to make sure that it is - accurate and complete. -ARM: - prettyName: ARM support - desc: | - Not that folks can't use GNU/Linux on ARM (obviously, the - Raspberry Pi has been a huge success), but there's still a lot - more friction to using GNU/Linux on ARM compared to x86. I'm - working on that. -GI: - prettyName: GObject Introspection - desc: | - GObject Introspection (which is a terrible name for what it is, - btw) is a cross-(language-runtime) object system. GObject was an - object system for C that game out of GTK+, and then GObject - Introspection was created as a way to specify the ABI for working - with an object, so that GObjects could be used from other - languages. I think that GObject Introspection is a really cool - technology that can be the basis of reducing friction between - languages, but it needs better/more-ubiquitous tooling. diff --git a/upstreams.yml b/upstreams.yml deleted file mode 100644 index 7dc0d70..0000000 --- a/upstreams.yml +++ /dev/null @@ -1,29 +0,0 @@ -- urls: [https://github.com/flori/json] - name: ruby-json - desc: | - Ruby's standard JSON gem (which comes bundled with the core Ruby - distribution!). -- urls: [https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio] - desc: | - The `mkinitcpio` tool generates init-ramdisk images to boot - GNU/Linux systems. -- urls: - - https://www.darwinsys.com/file/ - - https://mailman.astron.com/pipermail/file/ - - https://github.com/file/file - desc: | - The `file` tool sniffs a file to tell you about the file's - format. -- urls: - - https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git - - https://github.com/erofs/erofs-utils - desc: | - EROFS is the Enhanced Read-Only File System, a successor to - SquashFS. -- urls: [https://github.com/diamondburned/gotk4] - desc: | - gotk4 is a project that burries the lede: yes, it is a set of Go - bindings to GTK4. But (IMO) more interestingly, - `./gir/cmd/gir-generate` is a tool for generating Go bindings to - GObject Introspection (GI) libraries from the `.gir` files - describing the library. -- cgit v1.2.3-2-g168b