PR#4219: Add archive types for erofs and squashfs - koji

koji

#4219 Add archive types for erofs and squashfs

Opened 5 months ago by dcavalca. Modified 3 months ago

dcavalca/koji erofs into master

Add archive types for erofs and squashfs

Davide Cavalca • 3 months ago

d5d2abb

schemas/schema-upgrade-1.35-1.36.sql

file added

+11

		`@@ -0,0 +1,11 @@`
		`+ -- upgrade script to migrate the Koji database schema`
		`+ -- from version 1.35 to 1.36`
		`+`
		`+ BEGIN;`
		`+`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('erofs', 'erofs image', 'erofs') ON CONFLICT DO NOTHING;`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('erofs-compressed', 'Compressed erofs image', 'erofs.gz erofs.xz') ON CONFLICT DO NOTHING;`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('squashfs', 'SquashFS image', 'squashfs') ON CONFLICT DO NOTHING;`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('squashfs-compressed', 'Compressed SquashFS image', 'squashfs.gz squashfs.xz') ON CONFLICT DO NOTHING;`
		`+`
		`+ COMMIT;`

schemas/schema.sql

file modified

		`@@ -968,6 +968,10 @@`
		`INSERT INTO archivetypes (name, description, extensions) VALUES ('changes', 'Kiwi changes file', 'changes.xz changes');`
		`INSERT INTO archivetypes (name, description, extensions) VALUES ('packages', 'Kiwi packages listing', 'packages');`
		`INSERT INTO archivetypes (name, description, extensions) VALUES ('verified', 'Kiwi verified package list', 'verified');`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('erofs', 'erofs image', 'erofs');`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('erofs-compressed', 'Compressed erofs image', 'erofs.gz erofs.xz');`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('squashfs', 'SquashFS image', 'squashfs');`
		`+ INSERT INTO archivetypes (name, description, extensions) VALUES ('squashfs-compressed', 'Compressed SquashFS image', 'squashfs.gz squashfs.xz');`


		`-- Do we want to enforce a constraint that a build can only generate one`

dcavalca commented 5 months ago

Add archive types produced by Kiwi that we need.

Fixes: #4218

ngompa commented 5 months ago

This seems right. :thumbsup:

jnsamyak commented 5 months ago

+1 to it as well! People with power should merge this :muscle:

mikem commented 5 months ago

This appears to interfere with matching the existing liveimg-squashfs entry. I think we might need to adjust the logic in get_archive_type before we merge this.

mikem commented 5 months ago

This plus #4224 should be fine