Skip to content
Snippets Groups Projects
Commit de334cb4 authored by Greg DiCristofaro's avatar Greg DiCristofaro
Browse files

attempt to preemptively require openjfx libs instead of cached

parent ff60de91
No related branches found
No related tags found
No related merge requests found
...@@ -192,54 +192,55 @@ parts: ...@@ -192,54 +192,55 @@ parts:
# needed by solr to determine locally running ports # needed by solr to determine locally running ports
- lsof - lsof
# TODO may be needed by openjfx # TODO may be needed by openjfx
- libopenjfx-java
# taken from https://github.com/jgneff/openjfx/blob/edge/snap/snapcraft.yaml # taken from https://github.com/jgneff/openjfx/blob/edge/snap/snapcraft.yaml
- libatk1.0-0 # - libatk1.0-0
- libatk-bridge2.0-0 # - libatk-bridge2.0-0
- libatspi2.0-0 # - libatspi2.0-0
- libcairo2 # - libcairo2
- libcairo-gobject2 # - libcairo-gobject2
- libdatrie1 # - libdatrie1
- libepoxy0 # - libepoxy0
- libfontconfig1 # - libfontconfig1
- libfreetype6 # - libfreetype6
- libgdk-pixbuf2.0-0 # - libgdk-pixbuf2.0-0
- libgl1 # - libgl1
- libglvnd0 # - libglvnd0
- libglx0 # - libglx0
- libgraphite2-3 # - libgraphite2-3
- libgtk2.0-0 # - libgtk2.0-0
- libgtk-3-0 # - libgtk-3-0
- libharfbuzz0b # - libharfbuzz0b
- libpango-1.0-0 # - libpango-1.0-0
- libpangocairo-1.0-0 # - libpangocairo-1.0-0
- libpangoft2-1.0-0 # - libpangoft2-1.0-0
- libpixman-1-0 # - libpixman-1-0
- libpng16-16 # - libpng16-16
- libthai0 # - libthai0
- libwayland-client0 # - libwayland-client0
- libwayland-cursor0 # - libwayland-cursor0
- libwayland-egl1 # - libwayland-egl1
- libx11-6 # - libx11-6
- libxau6 # - libxau6
- libxcb1 # - libxcb1
- libxcb-render0 # - libxcb-render0
- libxcb-shm0 # - libxcb-shm0
- libxcomposite1 # - libxcomposite1
- libxcursor1 # - libxcursor1
- libxdamage1 # - libxdamage1
- libxdmcp6 # - libxdmcp6
- libxext6 # - libxext6
- libxfixes3 # - libxfixes3
- libxi6 # - libxi6
- libxinerama1 # - libxinerama1
- libxkbcommon0 # - libxkbcommon0
- libxrandr2 # - libxrandr2
- libxrender1 # - libxrender1
- libxtst6 # - libxtst6
# Gtk-Message: 16:12:52.145: Failed to load module "canberra-gtk-module" # # Gtk-Message: 16:12:52.145: Failed to load module "canberra-gtk-module"
- libcanberra-gtk3-module # - libcanberra-gtk3-module
# Gtk-Message: 10:57:54.572: Failed to load module "pk-gtk-module" # # Gtk-Message: 10:57:54.572: Failed to load module "pk-gtk-module"
- packagekit-gtk3-module # - packagekit-gtk3-module
plugin: nil plugin: nil
# source: https://github.com/sleuthkit/autopsy.git # source: https://github.com/sleuthkit/autopsy.git
source: https://github.com/gdicristofaro/autopsy.git source: https://github.com/gdicristofaro/autopsy.git
...@@ -280,6 +281,8 @@ parts: ...@@ -280,6 +281,8 @@ parts:
cat <<EOF > $AUTOPSY_LOCATION/bin/autopsywrapper.sh cat <<EOF > $AUTOPSY_LOCATION/bin/autopsywrapper.sh
#!/bin/bash #!/bin/bash
mkdir -p \$HOME/tmp mkdir -p \$HOME/tmp
echo libs in gnome-platform:
find \$SNAP_DESKTOP_RUNTIME -name *.so
echo Starting Autopsy... echo Starting Autopsy...
\$SNAP/autopsy/bin/autopsy \$SNAP/autopsy/bin/autopsy
EOF EOF
...@@ -291,23 +294,25 @@ parts: ...@@ -291,23 +294,25 @@ parts:
# sed -i '129 i ' "$AUTOPSY_LOCATION/platform/lib/nbexec" # sed -i '129 i ' "$AUTOPSY_LOCATION/platform/lib/nbexec"
# taken from https://github.com/ubuntu/thunderbird/blob/stable/snapcraft.yaml # taken from https://github.com/ubuntu/gnome-recipes/blob/stable/snapcraft.yaml
# Find files provided by the base and platform snap and ensure they aren't
# duplicated in this snap
cleanup: cleanup:
after: [autopsy] after: [ autopsy ]
plugin: nil plugin: nil
# NOTE: this will likely change as gnome extension has new revisions build-snaps: [core22, gtk-common-themes, gnome-42-2204]
build-snaps: [core22]
override-prime: | override-prime: |
set -eux set -eux
for snap in "core22"; do for snap in "core22" "gtk-common-themes" "gnome-42-2204"; do
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \; cd "/snap/$snap/current" && find . -type f,l -name *.so.* -exec rm -f "$CRAFT_PRIME/{}" \;
done
# remove cross-installed repeated libraries (in /usr/lib in the SDK, but in /usr/lib/TRIPLET
# here, and the opposite)
for snap in "core22" "gnome-42-2204"; do
cd "/snap/$snap/current/usr/lib"
for filename in [ *.so* ]; do
rm -f "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET/$filename"
done
cd "/snap/$snap/current/usr/lib/$CRAFT_ARCH_TRIPLET"
for filename in [ *.so* ]; do
rm -f "$CRAFT_PRIME/usr/lib/$filename"
done
done done
# TODO remove if effective
#build-snaps: [core22, gnome-42-2204]
# override-prime: |
# set -eux
# for snap in "core22" "gnome-42-2204"; do
# cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
# done
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment