Commit e7d4a693 authored by osak buildhauer user's avatar osak buildhauer user

Use an AWK script for modifying the post-install-remove thingy

The patch fails when versions change or (unrelated) packages (dis)appear,
messing up the order of lines in the manifest.
parent 8d23380f
......@@ -438,6 +438,8 @@ $(call ensure_mount,image_binary_files) $(IMAGE_DIR)/.lipbinaries: image_git_pul
$(call ensure_mount,image_remaster) $(IMAGE_DIR)/.remastered: $(IMAGE_DIR)/.lipbinaries
$(call patch_all,$(CURDIR)/patches/iso/,$(IMAGE_DIR))
awk -f $(CURDIR)/scripts/casper-remove-needed-packages-from-unistall-manifest.awk $(IMAGE_DIR)/casper/filesystem.manifest-remove > /tmp/fs.manifest
mv /tmp/fs.manifest $(IMAGE_DIR)/casper/filesystem.manifest-remove
touch "$(IMAGE_DIR)/.remastered"
$(call ensure_mount,image_content): image_git_pull $(IMAGE_DIR)/.remastered $(IMAGE_DIR)$(GRUB_INSTALL_DIR)/lipinfo.cfg $(IMAGE_DIR)$(GRUB_INSTALL_DIR)/.lipgrub
......
--- a/casper/filesystem.manifest-remove
+++ b/casper/filesystem.manifest-remove
@@ -45,8 +45,6 @@ libfcitx-gclient0:amd64
@@ -45,7 +45,6 @@ libfcitx-gclient0:amd64
libfcitx-qt0:amd64
libfcitx-qt5-1:amd64
libfcitx-utils0:amd64
-libgeoclue0:amd64
-libjavascriptcoregtk-4.0-18:amd64
liblua5.2-0:amd64
liblvm2app2.2:amd64
......@@ -16,7 +15,7 @@
-libwebkit2gtk-4.0-37:amd64
-libwebkit2gtk-4.0-37-gtk2:amd64
linux-signed-generic
-linux-signed-image-4.4.0-18-generic
-linux-signed-image-4.4.0-9136-generic
linux-signed-image-generic
localechooser-data
lupin-casper
......
#!/usr/bin/awk
BEGIN {
# This is the number of things we're going to remove. Adjust it when changing the regular expression below
want = 6;
skipped = 0;
}
function skipit() {
skip = 1;
skipped += 1;
print "removing", $0 >"/dev/stderr"
}
{ skip = 0; }
/^linux-signed-image-.*-generic/ {
skipit()
}
/^zenity/ {
skipit()
}
/^(lib(javascriptcoregtk|webkit2gtk))/ {
skipit()
}
skip == 0 {
print
}
END {
if (want != skipped) {
print "I removed ", skipped, " thingies, wanted ", want > "/dev/stderr"
exit 1;
}
exit 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment