Remove psplash build

README.md

@@ -15,11 +15,6 @@ including:
 * u-boot binaries (for various models) from the u-boot-rpi package
 * u-boot boot script from the flash-kernel package (classic gadgets only)
 
-On core builds, a silent boot with a splash screen is included. The splash
-screen binary comes from
-[git://git.yoctoproject.org/psplash](http://git.yoctoproject.org/cgit/cgit.cgi/psplash/).
-Please see the `psplash/` sub directory for patches and adjustments in use.
-
 ## Gadget Snaps
 
 Gadget snaps are a special type of snaps that contain device specific support
@@ -34,13 +29,13 @@ https://github.com/snapcore/pi-gadget/issues
 
 ## Branding
 
-This gadget snap comes with a boot splash. To change the logo you can add a new
-png file to the psplash subdirectory of this tree, adjust the "SPLASH=" option
-in `psplash/config` to point to this file and rebuild the gadget.
+This gadget snap enables by default the boot splash. To customize it
+on Ubuntu Core, you can follow the instructions provided in the UC
+[documentation](https://ubuntu.com/core/docs/splash-screen).
 
-To turn off the splash screen completely please edit `configs/core/cmdline.txt`
-and remove the `splash` and the `vt.handoff=2` keywords from the default kernel
-command line.
+To turn off the splash screen please edit `configs/cmdline.txt-core`
+and remove the `splash` and the `vt.handoff=2` keywords from the
+default kernel command line.
 
 ## Branches
 

snapcraft.yaml

@@ -44,72 +44,6 @@ parts:
       - lsb-release
       - dpkg-dev
       - make
-  psplash-local:
-    plugin: dump
-    prime: [-*]
-    source: .
-    stage: [psplash]
-  psplash:
-    after: [psplash-local]
-    source-type: git
-    source: https://git.yoctoproject.org/psplash
-    source-commit: 2015f7073e98dd9562db0936a254af5ef56356cf
-    plugin: nil
-    override-build: |
-      set -x
-      if [ "$SNAPCRAFT_ARCH_TRIPLET" = "x86_64-linux-gnu" ] || [ -z "$SNAPCRAFT_ARCH_TRIPLET" ]; then
-        # manually set since new snapcraft doesn't like --target-arch when 
-        # building with lxd/multipass
-        BUILD_ARCH_TRIPLET=aarch64-linux-gnu
-      else
-        BUILD_ARCH_TRIPLET=$SNAPCRAFT_ARCH_TRIPLET
-      fi
-      export TREE="${SNAPCRAFT_STAGE:-.}/psplash"
-      . ${TREE}/config
-      if ! $(echo "$FONT" | grep -q ^/); then
-        FONT="${TREE}/${FONT}"
-      fi
-      if ! $(echo "$SPLASH" | grep -q ^/); then
-        SPLASH="${TREE}/${SPLASH}"
-      fi
-      git apply ${TREE}/psplash.patch
-      ${TREE}/font-gen.sh "$FONT"
-      ./make-image-header.sh "$SPLASH" CORE psplash-core
-      aclocal
-      autoreconf --install
-      if ! dpkg-architecture -t "${SNAPCRAFT_ARCH_TRIPLET}" -e \
-          $(dpkg-architecture -q DEB_BUILD_ARCH)
-      then
-        export CROSS_COMPILE=$(dpkg-architecture \
-          -t "${BUILD_ARCH_TRIPLET}" -q DEB_HOST_GNU_TYPE)-
-      else
-        export CROSS_COMPILE=
-      fi
-      ./configure --build=$(dpkg-architecture -q DEB_BUILD_GNU_TYPE) \
-        --host=${BUILD_ARCH_TRIPLET} CC=${CROSS_COMPILE}gcc || cat config.log
-      ARCH=$(dpkg-architecture -t "${BUILD_ARCH_TRIPLET}" -q DEB_HOST_ARCH) make
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr
-      cp -a $TREE/initrd .
-      mkdir -p initrd/bin
-      cp psplash initrd/bin
-      mkdir -p $SNAPCRAFT_PART_INSTALL/boot-assets
-      cd initrd && find . | cpio --quiet -o -H newc | lz4 -9 -l >> \
-        "${SNAPCRAFT_PART_INSTALL}/boot-assets/psplash.img"
-    build-packages:
-      - libgdk-pixbuf2.0-dev
-      - automake
-      - autoconf
-      - gcc
-      - otf2bdf
-      - libbogl-dev
-      - fonts-ubuntu
-      - cpio
-      - findutils
-      - liblz4-tool
-      - libc-dev
-      - on amd64:
-          - gcc-aarch64-linux-gnu:amd64
-          - libc6-dev-arm64-cross:amd64
 
 slots:
   bcm-gpio-0: