Consolidation and add Devuan keys to Ubuntu Dockerfile. #3

Open

harry wants to merge 23 commits from add_devuan into devuan

pull from: add_devuan

merge into: cyteen:devuan

cyteen:master

cyteen:devuan

cyteen:draft03-0.1

cyteen:cherry

cyteen:test_devuan

cyteen:gpt

Conversation 0 Commits 23 Files changed 7 +489 -17

harry commented 2024-05-16 10:45:37 +00:00

Collaborator

Copy link

No description provided.

harry added 16 commits 2024-05-16 10:45:55 +00:00

debians: Update Debian/Ubuntu versions fb6dfb993d

docs: Regenerate boards 6ee61b294c

rebuild-debian-csv: Use dist names not ls-lR.gz. ... 4d56c211b7

Get codenames from the package repository's web page, because
Devuan does not have an ls-lR.gz file.

Uses python3-lxml.

rebuild-debian-csv: Add Devuan Linux release names. ... 13ab9f88d4

Needs rebuild-debian-csv: Use dist names not ls-lR.gz.

debians-arm.csv
debians-x86.csv

build-debian: Add support for Devuan Linux images. aeca8502e7

Add Dockerfile to build Devuan Linux images. ... 287dd113ad

Dockerfile_devuan is FROM devuan/devuan:daedalus

README_devuan.md

chore: build-debian: revert layout of debootstrap commands e475fd11ac

Fix: Dockerfile.devuan now based on Dockerfile. ... 7376f17860

README_devuan.md

Chore: layout typos. d93fb2763c

Fix: typos. 28b0d5788b

Fix: README_devuan.md layout. 423df3b780

Fix: README_devuan: backtick typo. 78a1d3fba4

Fix: README_devuan.md: Markdown typo. d4ff2f3e88

Chore: README_devuan.md: Place examples together at the end. d8283e6726

Chore: Delete Dockerfile_devuan. We use Dockerfile.devuan. 946d0fb451

Dockerfile.devuan: Use only 'ceres main' in the source list. 0a187d22c9

harry added 1 commit 2024-05-16 13:22:50 +00:00

README_devuan.md: Added "Don't report Devuan-issues to johang". 5051f51955

harry added 1 commit 2024-05-16 13:36:53 +00:00

README_devuan.md: Typo on image name. 859ecdc7d9

harry added 1 commit 2024-05-16 13:55:33 +00:00

README_devuan.md: review markdown syntax problem. 1d01ead61a

harry added 1 commit 2024-05-16 13:59:13 +00:00

README_devuan.md: markdown syntax again. 7be04ca1a9

harry added 1 commit 2024-05-16 14:02:30 +00:00

README_devuan.md: markdown work-around. d325765798

harry added 1 commit 2024-05-16 18:06:41 +00:00

README_devuan: Complete the 'combination' tables. 703710f763

harry added 1 commit 2024-05-16 20:45:00 +00:00

README_devuan.md: Add TOC. 03979dc523

harry added 1 commit 2024-05-17 01:56:14 +00:00

Dockerfile.devuan: Add python3-lxml for rebuild-debian-csv. a256d0d923

harry added 1 commit 2024-05-17 02:16:18 +00:00

Dockerfile: Add python3-lxml for rebuild-debian-csv. c37d4b0a79

Some checks failed

Hide all checks

sd-card-images CI / test ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.suite }} (i386, debian, bookworm) (push) Failing after 5m30s

Details

sd-card-images CI / test ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.suite }} (i386, debian, bullseye) (push) Failing after 4m14s

Details

sd-card-images CI / test ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.suite }} (i386, debian, sid) (push) Failing after 3m44s

Details

sd-card-images CI / test ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.suite }} (i386, debian, trixie) (push) Failing after 5m35s

Details

sd-card-images CI / build docker images (push) Has been skipped

Details

This pull request has changes conflicting with the target branch.

• Dockerfile
• Dockerfile.devuan
• README_devuan.md
• metascripts/rebuild-debian-csv
• scripts/build-debian

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'Consolidation and add Devuan keys to Ubuntu Dockerfile.' (#3) from add_devuan into devuan

Merge commit body Reviewed-on: https://git.ring-zero.co.uk/cyteen/sd-card-images/pulls/3

Merge pull request 'Consolidation and add Devuan keys to Ubuntu Dockerfile.' (#3) from add_devuan into devuan Reviewed-on: https://git.ring-zero.co.uk/cyteen/sd-card-images/pulls/3 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin add_devuan:add_devuan

git switch add_devuan

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch devuan

git merge --no-ff add_devuan

git switch add_devuan

git rebase devuan

git switch devuan

git merge --ff-only add_devuan

git switch add_devuan

git rebase devuan

git switch devuan

git merge --no-ff add_devuan

git switch devuan

git merge --squash add_devuan

git switch devuan

git merge --ff-only add_devuan

git switch devuan

git merge add_devuan

git push origin devuan

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

cyteen/sd-card-images!3

No description provided.