Commit Graph

933 Commits (f9b299ec4d11b9147d71e6dc22fc47794f3399e3)

Author SHA1 Message Date
Steve Langasek d3d636a6e0 Don't set a desktop base seed for ubuntu-base or ubuntu-core.
2 years ago
Łukasz 'sil2100' Zemczak e159d2267c Merge branch 'int/alex/riscv_mpfs' of git+ssh://git.launchpad.net/~alexghiti/livecd-rootfs into ubuntu/master
2 years ago
Steve Langasek 2b5e8a81e5 Default to using 'desktop' for the base seed so we don't have another place we have to extend the list for each new flavor (ubuntu-unity)
2 years ago
Steve Langasek 1f0a3d7797 Fix passing of components to germinate commandline (how did this ever work?)
2 years ago
Steve Langasek b3343c1255 Drop edubuntu and kubuntu-active, both obsolete in *all* supported releases.
2 years ago
Steve Langasek e41c6f50df Drop use of deprecated apt-key.
2 years ago
Steve Langasek 3722d2ee58 Drop override of components for raspi images
2 years ago
Steve Langasek 9cc8267f07 live-build/auto/config: set COMPONENTS for all flavors *before* we invoke germinate. Fixes a regression introduced in commit 07873ec. In the process, stop declarations of COMPONENTS that shadow the default in germinate (main restricted).
2 years ago
Alexandre Ghiti f68433098d riscv: Add support to build Microchip Icicle Kit image
2 years ago
Alexandre Ghiti d5a7d6655f riscv: Install Wifi driver by default for the LicheeRV
2 years ago
Alexandre Ghiti e8ea6335d5 riscv: Add support to build LicheeRV Dock images
2 years ago
Łukasz 'sil2100' Zemczak 815d26a19c Comment cleanup for ubuntu-unity.
2 years ago
Rudra Bali 0581c7fd8a fix typo
2 years ago
Rudra Bali 7f278b020d use ubuntu-unity-desktop metapackage for now
2 years ago
Rudra Bali c897750648 add live packages for Ubuntu Unity, since live task does not exist
2 years ago
Rudra Bali bbd0e9fa5a switch to ubuntu-unity-desktop task for Ubuntu Unity
2 years ago
Rudra Bali 503f9e8950 add Ubuntu Unity to daily flavors
2 years ago
Łukasz 'sil2100' Zemczak eec8f595d3 Make sure that the recent riscv64 changes for our supported devices don't install wpasupplicant on non-SUBARCH builds (like for clouds).
2 years ago
Alexandre Ghiti 2485e0bebf riscv: Install wpasupplicant by default
2 years ago
Steve Langasek abcfabdbc0 Drop support for building i386 images aside from the launchpad builder images.
2 years ago
Alexandre Ghiti 6224b11fc0 riscv: Add support for StarFive VisionFive
3 years ago
Alexandre Ghiti be54b8b7a1 riscv: Fix nezha hardcoded password attempt
3 years ago
Alexandre Ghiti f751ff7218 RISC-V: enable building for Nezha board
3 years ago
Michael Hudson-Doyle fb589ecf00 Produce a tarball of artifacts for netbooting during live-server build.
3 years ago
Michael Hudson-Doyle 31937f1a4d auto/config: Emit error message to stderr in _sanitize_passes.
3 years ago
Michael Hudson-Doyle ed38882219 auto/config: preserve germinate-output directory when removing config
3 years ago
Dimitri John Ledkov e5443e3588
auto/config: upgrade from hwe-20.04 to hwe-22.04 variant.
3 years ago
Dimitri John Ledkov 461731d538
Merge branch 'rip-0c3.net' into ubuntu/master
3 years ago
Jean-Baptiste Lallement 80ccea8d63 Separate WSL from CPC
3 years ago
Dimitri John Ledkov 27e7780d70
auto/config: drop support for 0c3.net
3 years ago
Łukasz 'sil2100' Zemczak e4c846199b Following Dave's changes to the classic pi gadget, switch to using the classic branch for desktop images as well.
3 years ago
Brian Murray 16c1851a90 Add the casper package instead of the lupin-casper package as the installer for Windows is a project that is no longer supported and lupin is being removed the archive in LP: 1960457.
3 years ago
Brian Murray e5beee30fd Add the capability to build an ISO image for the Intel IoT project. Additionally, stop using universe with the project given that the kernel is now in main.
3 years ago
Erich Eickmeyer 04c4a14a4e Remove fonts and publishing tasks form ubuntustudio
3 years ago
Sebastien Bacher 808220c868 Enable universe sources on the desktop canary
3 years ago
Brian Murray 85fb768f4f Properly check ARCH when setting the intel-iot model.
3 years ago
Michael Hudson-Doyle f5bdeaf4fb Merge branch 'language-support-in-catalogs' into ubuntu/master
3 years ago
Michael Hudson-Doyle 391439d44c Record information about locale support (in particular, whether to install langpacks and which languages have pre-baked squashfses).
3 years ago
Dan Bungert a96d56a110 desktop: install-sources.yaml type fsimage-layered
3 years ago
Steve Langasek 9e6b983728 Merge remote-tracking branch 'toabctl/keep-debian-native-package-changelogs' into ubuntu/master
3 years ago
Thomas Bechtold 2b2f67c7fb Keep changelogs in minimized builds for native deb pkgs
3 years ago
Michael Hudson-Doyle 8f8fc220c7 Generate source catalogs for the desktop canary build.
3 years ago
Michael Hudson-Doyle fe38bd02c1 Change the per language layers in the desktop canary build to have more regular names (and make their implementation better documented and hopefully more comprehensible).
3 years ago
Michael Hudson-Doyle 17279822d5 Get source catalog translations from subiquity git, as brz is in universe.
3 years ago
Michael Hudson-Doyle cda8c920dd create source catalogs for live server install sources
3 years ago
Brian Murray 44384357ad add missing for intel-iot
3 years ago
Michael Hudson-Doyle 116a51a080 bootstrap the minimal variant for the minimal server layer
3 years ago
Michael Hudson-Doyle 5fda0bb2aa apply dpkg minimizations to minimal layer, and undo them for full layer
3 years ago
Michael Hudson-Doyle d11c71a686 add a minimal server layer under the full server layer
3 years ago
Sebastien Bacher 5ba545f2b6 Tweaks to the canary packages
3 years ago
Sebastien Bacher cdbb5598ad Remove lupin-casper from the canary image
3 years ago
Brian Murray dbab97caa9 switch amd64 to the arch variable
3 years ago
Brian Murray c09110cfa8 add support for intel-iot models
3 years ago
Brian Murray f2c1300f71 rename iotg iot so the names are consistent with the models
3 years ago
Michael Hudson-Doyle bb0bba1793 address review comments
4 years ago
Michael Hudson-Doyle f563b310d3 update auto/config for move of live-server to layers
4 years ago
Michael Hudson-Doyle fb8af1fd80 add a way to prevent a layer (and descendants) from being made into a sqashfs
4 years ago
Michael Hudson-Doyle 75165aeb34 replace call to Echo_warning with plan echo as former is not defined at this point
4 years ago
Brian Murray ad3e755974 rename iotg to intel-iotg so its slightly more descriptive
4 years ago
Brian Murray 066422894b also support building an ubuntu-cpc amd64 iotg image
4 years ago
Brian Murray d8b24aaae6 add iotg as a subarch of amd64 w/ image-intel kernel
4 years ago
Łukasz 'sil2100' Zemczak 83852ca96b Revert previous change, use ubuntu-server-raspi task name.
4 years ago
Łukasz 'sil2100' Zemczak d2cfa41ec2 Use the server-raspi task name instead of ubuntu-server-raspi
4 years ago
Sebastien Bacher 48f3682969 Define a new add_snap and use it for canary
4 years ago
Sebastien Bacher 740c960575 The u-boot-tools package was typoed
4 years ago
Michael Hudson-Doyle 5c3bb6896c Remove all references to the "base" project, which has not been built since 16.04 release day.
4 years ago
Steve Langasek c7b751e401 Drop code for the 'ubuntu-core' project when not using image_format: ubuntu-image, as this is obsolete and not used to build core* snaps in recent series.
4 years ago
Dimitri John Ledkov f58b0693f6
Merge branch 'raspi-server-seed' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master
4 years ago
Dimitri John Ledkov dd79c5c75d
buildd: Re-enable merged /usr by default, as it is now required
4 years ago
Dimitri John Ledkov dc2a472871
magic-proxy: replace http.client with urllib calls
4 years ago
Dimitri John Ledkov 1cd8fe14b7
Change iptables calls, to query rules and quickly check that connectivity works after transparent proxy has been installed. LP: #1917920
4 years ago
Dimitri John Ledkov 20f76e7cf8
Merge branch 'preinstalled' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
4 years ago
Michael Hudson-Doyle 749bdeac44 Merge branch 'ubuntu/master' into new-ubuntu-oci
4 years ago
Dimitri John Ledkov d5a8116428
Add support for generic preinstalled images. LP: #1923832
4 years ago
Thomas Bechtold a81972a58b
add configure_oci function and use it in ubuntu-oci
4 years ago
Thomas Bechtold ac4a95b931
Add new ubuntu-oci project
4 years ago
Łukasz 'sil2100' Zemczak 52f3b69331 Enable using ubuntu-server-raspi, clean up handling of raspi setup.
4 years ago
Łukasz 'sil2100' Zemczak b9eb0aaee3 Drop imx6 support as it never really happened.
4 years ago
Łukasz 'sil2100' Zemczak 1d537bf78d Temporarily hack in ubuntu-raspi-settings for raspi images (we should be using seeds tho).
4 years ago
Iain Lane 42409e7068
auto/config: Install pi-bluetooth for raspi images
4 years ago
Sebastien Bacher ed8ee60c98 Desktop is using the hwe kernel, do the same on canary
4 years ago
Łukasz 'sil2100' Zemczak c2733a55f7 Still hardcode UC20 amd64 image size, but to the same value as for UC16 and UC18.
4 years ago
Dimitri John Ledkov 2f84bc9a84
config: on hirsute build UC22 images
4 years ago
Dimitri John Ledkov a808b28d47
riscv64: build preinstalled riscv64 image with uboot SPL and CIDATA.
4 years ago
Łukasz 'sil2100' Zemczak dda73b5591 Do not hard-code the UC20 amd64 image size anymore.
4 years ago
Dimitri John Ledkov 8e986c20fd
Merge remote-tracking branch 'seb128/layered-languages-fix' into ubuntu/master
4 years ago
Sebastien Bacher fa5c2092c7 During the layered build generate the right content for no languages
4 years ago
Dimitri John Ledkov e2fd168f50
amd64: always install grub-pc with shim-signed
4 years ago
Dimitri John Ledkov 1c7d688319
auto/config: scope ubuntu:desktop-preinstalled:raspi image options
4 years ago
Dimitri John Ledkov 5d9af7f3c5
auto/config: seed ubuntu-desktop when building hyperv image
4 years ago
Łukasz 'sil2100' Zemczak 5a7b332745 Build classic raspi server images by default from the 'classic' branch now.
4 years ago
Łukasz 'sil2100' Zemczak eda716902e For desktop-preinstalled we don't need cloud-image.
4 years ago
Łukasz 'sil2100' Zemczak fdd8b1cba0 Use the right task name - ubuntu-desktop-raspi.
4 years ago
Łukasz 'sil2100' Zemczak 38157b3748 First batch of changes for raspi desktop.
4 years ago
Steve Langasek 37f5f8881f Revert "Revert "Remove fstab from squashfs images""
4 years ago
Steve Langasek d9de270189 Revert "Remove fstab from squashfs images"
4 years ago
Robert C Jennings e3dce0ab17
Handle seeded lxd snap with channel name for ubuntu-cpc:minimized
4 years ago
Dimitri John Ledkov 109e6c6613
auto/build: use setup|teardown_mountpoint to reduce duplication
4 years ago
Robert C Jennings 84397b5098
Avoid rbind /sys for chroot snap pre-seeding (cgroups fail to unmount)
4 years ago
Dimitri John Ledkov 31861fd40d
seccomp: mount more up-to-date seccomp features
5 years ago
Dimitri John Ledkov a14a31b751
apparmor: mount more up-to-date apparmor features in the chroot.
5 years ago
Robert C Jennings 1ca11c9795
Apply snap-preseed optimizations after seeding snaps
5 years ago
David Krauser 4c504f6781 Fix broken minimal cloud image boot on amd64
5 years ago
Balint Reczey f96e874ed1 Remove fstab from squashfs images
5 years ago
Łukasz 'sil2100' Zemczak 40103430d8 Enable overrides of UC20 grade dangerous channels
5 years ago
Dimitri John Ledkov b9177cfd59 Fixup indentation
5 years ago
Dimitri John Ledkov 6e8b5b94c4 ubuntu-image: fix focal+ pi images for armhf to use pi-armhf model name.
5 years ago
Dimitri John Ledkov 668898d92c Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible.
5 years ago
Dimitri John Ledkov 56ac1865f7 Switch Ubuntu desktop to only hwe-20.04 kernel flavour.
5 years ago
Łukasz 'sil2100' Zemczak d2a2ac41a4 Use the raspi KERNEL_FLAVOUR for the raspi images.
5 years ago
Dimitri John Ledkov cb574d4cb3 minimized: reinstall packages one by one, instead of all of them together, as otherwise apt fails to immediately configure libc6:amd64 & libgcc-s1. LP: #1867607
5 years ago
Dimitri John Ledkov 910310dbbb Only install oem-20.04 kernel flavour on amd64, as it doesn't exist on other arches.
5 years ago
Łukasz 'sil2100' Zemczak 40c51f78b8 Switch to using the generic pi gadget repo for classic, use the main branches.
5 years ago
Łukasz 'sil2100' Zemczak 95772fd9df Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into u-i-disk-info
5 years ago
Łukasz 'sil2100' Zemczak e9170e053b Rename the raspi3 SUBARCH to raspi
5 years ago
Dimitri John Ledkov 17dc48cf65 Set uc20 image size to 10G.
5 years ago
Dimitri John Ledkov 438606c5e8 Encode CHANNEL specification in the UC20 model names.
5 years ago
Dimitri John Ledkov db0c7d68f2 Although the request flavour to install is oem-20.04, it really is called just oem on disk. Override the flavour name from oem-20.04 to oem when renaming built artefacts. This also means that ubuntu-cdimage needs to simply download 'oem' vmlinuz+initrd pairs, not 'oem-20.04'.
5 years ago
Dimitri John Ledkov f6ca600af2 Install oem-20.04 kernel flavour on Ubuntu Desktop builds.
5 years ago
Łukasz 'sil2100' Zemczak 2870738f00 Merge the manually-pushed 2.636 from Laney.
5 years ago
Łukasz 'sil2100' Zemczak 2ca3cc9720 Use the datestamp parameter (stored in NOW) instead of the newly added BUILD_ID.
5 years ago
Łukasz 'sil2100' Zemczak fc6d956269 Support generating a .disk/info file via ubuntu-image if BUILD_ID is passed from cdimage to the builder.
5 years ago
Michael Hudson-Doyle f27b432026 ubuntu-cpc hooks are Different
5 years ago
Michael Hudson-Doyle fb31b64a7c preserve apt preferences for all projects
5 years ago
Michael Hudson-Doyle d38ceab06d fix in case of no preferences
5 years ago
Michael Hudson-Doyle 94c2d606ca Preserve apt preferences created by any package we install (i.e. ubuntu-advantage-tools) against live-build's attempt to delete them. (LP: #1855354)
5 years ago
Łukasz 'sil2100' Zemczak 474f232840 Snapd for uc20 model assertions does not support global channel overrides.
5 years ago
Łukasz 'sil2100' Zemczak a1daf38b93 Add support for Ubuntu Core 20 builds by supporting uc20 models.
5 years ago
Dimitri John Ledkov 3551fc1a02 Ship two kernel flavours on desktop image.
5 years ago
Dimitri John Ledkov 39f675eaf6 Drop installing dummy transitional linux-signed-generic, these days linux-generic is always signed, on arches that need/support it.
5 years ago
David Krauser 52a3471922 Add hooks to build bootable buildd images.
5 years ago
Łukasz 'sil2100' Zemczak ac40cadf08 Support fetching classic gadget trees from a non-github-mirrored launchpad repo.
5 years ago
Łukasz 'sil2100' Zemczak 2896d39a7a Make sure the imx6 subarch uses the ubuntu-image imageformat.
5 years ago
Adam Conrad 7c85d91d41 Limit the lxd group to images with an installer; it's less appropriate for random tarball images, which are configured in ways we don't know.
5 years ago
Michael Hudson-Doyle c89806ba4d Do not create a hook manually for ubuntu-cpc builds, make-hooks does not like that.
5 years ago
Michael Hudson-Doyle 4788e90315 Create the lxd group as a system group for all projects. (LP: #1844498)
5 years ago
Robert C Jennings 8cb442c3e8
magic-proxy: dump proxy log to stdout on failure
5 years ago
Łukasz 'sil2100' Zemczak 1f8f86c17c Final fix to 999-ubuntu-image-customization.chroot, tested to be working.
5 years ago
Łukasz 'sil2100' Zemczak 6cd2343bea Fix the styling to fit the rest a bit better.
5 years ago
Łukasz 'sil2100' Zemczak c7f3374f9f Final changes to the 999-ubuntu-image-customization.chroot hook.
5 years ago
Łukasz 'sil2100' Zemczak c3002a563a Merge branch 'u-i-cloud-init' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master
5 years ago
Łukasz 'sil2100' Zemczak d7c4bb4d85 Do not initialize EXTRA_SNAPS with an empty value. Allow overrides via the environment.
5 years ago
Łukasz 'sil2100' Zemczak 006ed85460 Add support for the Nitrogen6x board.
5 years ago
Colin Watson dc61b17db3 Use iptables-legacy on older kernel versions
5 years ago
Iain Lane b68a5abf65
snap seeding: Defer validation for regular image builds
5 years ago
Colin Watson 9a65a4013d Undivert update-initramfs more carefully
5 years ago
Łukasz 'sil2100' Zemczak f6cbbf01e1 Add a new u-i specific chroot hook, move the NoCloud system-boot cloud-init datasource configuration there to make sure all u-i built ship with it.
5 years ago
Łukasz 'sil2100' Zemczak b4ba74885f Remove pulseaudio and udisks2 from kassel images. This will fix the image build failures.
6 years ago
Robert C Jennings cb535805d7
ubuntu-cpc: rework image artifact cleanup
6 years ago
David Krauser 5a2b49950a Fixing broken binary hook symlinks for hyperv gallery image builds.
6 years ago
Łukasz 'sil2100' Zemczak 1e275b6b46 Append seeded snaps to manifests for all images.
6 years ago
Dimitri John Ledkov 124d074101 Unbreak cpc/server builds, by ensuring that includes are copied with archived symlinks, and only hooks resolve symlinks when getting copied.
6 years ago
Colin Watson dc85df854b Add tzdata to buildd images
6 years ago
David Krauser 0e3b1e206b
Add support for HyperV Gallery images
6 years ago
Dimitri John Ledkov d7b629cae6 Do not force lzma on ubuntu-core builds, the compress format default should be set universally inside initramfs-tools-ubuntu-core package instead of getting duplicated multiple times all over the place.
6 years ago
Dimitri John Ledkov 3d36dc0794 Stop overriding initramfs compression default to lzma. LP: #1831736
6 years ago
Dimitri John Ledkov 11756d2d1e Fix typpo when dropping jasper.
6 years ago
Dimitri John Ledkov de1055de29 Merge branch 'dead-ubuntu-rtm' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
6 years ago
Dimitri John Ledkov 702ccb4c77 Merge branch 'dead-ubuntu-touch' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
6 years ago
Dimitri John Ledkov af96b80116 Merge branch 'dead-ubuntu-desktop-next' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
6 years ago
Dimitri John Ledkov 97adf4c160 Merge branch 'drop-old-arm' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
6 years ago
Dimitri John Ledkov b0312baeb7 Merge branch 'dead-jasper' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
6 years ago
Dimitri John Ledkov 1a3eaf75c8 Merge branch 'dead-wubi' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
6 years ago
Łukasz 'sil2100' Zemczak e3b7b319c1 Merge branch 'uc18-kassel' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master
6 years ago
Dimitri John Ledkov d56653396d Drop ubuntu-rtm configs
6 years ago
Dimitri John Ledkov 44fd9ba9fd Drop ubuntu-touch configs
6 years ago
Dimitri John Ledkov 2aa3a59b7c Drop ubuntu-desktop-next configs
6 years ago
Dimitri John Ledkov 5b89298cd9 Drop old arm platforms.
6 years ago
Dimitri John Ledkov c596d3d376 Drop dead jasper subproject.
6 years ago
Dimitri John Ledkov 6d02eac861 Drop dead wubi subproject.
6 years ago
Steve Langasek c306763147 Strip translation files out of the minimal images.
6 years ago
Julian Andres Klode bed915a0fb Don't purge busybox-static in minimized, no longer installed
6 years ago
Michael Hudson-Doyle 42992467a1 Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds. (LP: #1828118)
6 years ago
Julian Andres Klode e95ad81c47 Run clean_debian_chroot after minimize_manual
6 years ago
Steve Langasek b83f70a2ea Add support for the 'kassel' subflavor of UC18 images.
6 years ago
Tobias Koch 05e71b3840 Do not include any snaps in ubuntu-cpc:minimized builds
6 years ago
Balint Reczey 2d162dd121 Pass --sort=name to tar to make tarballs more reproducible and rsync-friendly
6 years ago
Didier Roche b20cf752e6 Add languages to live pass
6 years ago
Didier Roche 995f3cf9e0 Ensure default langpacks are removed after installation
6 years ago
Jean-Baptiste Lallement 38bb0b3301 Fix grub divert for multilayer images
6 years ago
Steve Langasek ea5f01942f divert grub when calling into lb chroot
6 years ago
Łukasz 'sil2100' Zemczak 8c8b7164d4 Support building pi3-arm64 core18 images. At the same time, make sure we still use the right gadget tree repository for the classic arm64 pi3 image.
6 years ago
Balint Reczey 039ed8ec31 Merge fixing minimized text spacing
6 years ago
Balint Reczey 0182d380ca Nicely separate motd text about minimizing from texts above
6 years ago
Balint Reczey a06d208871 Merge branch feature/parallelization-pkg-version-fixing
6 years ago
Colin Watson 305d5cef50 Drop code to handle buildd images for <disco
6 years ago
Colin Watson 36af2769dc Disable merged /usr in buildd images
6 years ago
Tobias Koch 5b70d86f5c Inject a proxy into the build providing a snapshot view of the package repo.
6 years ago
Michael Hudson-Doyle a9991a908e revert change to ubuntu-server:live snap seeding
6 years ago
Jean-Baptiste Lallement f84d92d76f Calculate total size of the image + typos
6 years ago
Jean-Baptiste Lallement 3db920c40c Fixed quoting of subproject variable
6 years ago
Jean-Baptiste Lallement 52d9bd3ead Run live specific scripts on non live layers
6 years ago
Jean-Baptiste Lallement 283871573d Changed the naming scheme for multi layer images to dot format
6 years ago
Jean-Baptiste Lallement addef92e23 Decouple from ubuntu-cdimage & debian-cd landings
6 years ago
Jean-Baptiste Lallement 2d2ce6eea4 Rename chroot.$PASS -> overlay.$PASS
6 years ago
Jean-Baptiste Lallement e0d30dd2d3 Fixed substract -> subtract
6 years ago
Jean-Baptiste Lallement 41becb0af7 Ensure snaps are available on ubuntu-server live
6 years ago
Jean-Baptiste Lallement 3075d65578 Cleanup and handle manifest-remove files
6 years ago
Jean-Baptiste Lallement 9dba350834 Added lb_binary_layered
6 years ago
Jean-Baptiste Lallement 43ec452fa0 Moved reusable functions to functions
6 years ago