Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 17:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

slightly adjust the version handling for the core snap, drop suffix from kernel snap version string

Browse Source
This commit is contained in:
Oliver Grawert 2016-07-21 10:09:39 +02:00
parent f6058dfdb4
commit 418501bc65
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -1,4 +1,4 @@
livecd-rootfs (2.420ubuntu1) UNRELEASED; urgency=medium livecd-rootfs (2.420) UNRELEASED; urgency=medium
[ Łukasz 'sil2100' Zemczak ] [ Łukasz 'sil2100' Zemczak ]
* Remove the ubuntu-pd project from the scripts * Remove the ubuntu-pd project from the scripts
@ -7,6 +7,7 @@ livecd-rootfs (2.420ubuntu1) UNRELEASED; urgency=medium
[ Oliver Grawert ] [ Oliver Grawert ]
* sanitize the version number of the ubuntu-core snap * sanitize the version number of the ubuntu-core snap
* sanitize the version number of the kernel snap
-- Oliver Grawert <ogra@ubuntu.com> Tue, 19 Jul 2016 13:59:16 +0200 -- Oliver Grawert <ogra@ubuntu.com> Tue, 19 Jul 2016 13:59:16 +0200

6
live-build/auto/build
View File

@ -257,7 +257,9 @@ if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
mkdir -p $rootfs/$dir mkdir -p $rootfs/$dir
done done
VERSION="$(lsb_release -r -s)" # get a proper version from the chroot
. $rootfs/etc/os-release
VERSION="$(echo $PRETTY_NAME | sed 's/[^0-9.]*//g')"
CORENAME="ubuntu-core" CORENAME="ubuntu-core"
cat > $rootfs/meta/snap.yaml <<EOF cat > $rootfs/meta/snap.yaml <<EOF
@ -508,7 +510,7 @@ EOF
ln -s $kernel kernel.img ln -s $kernel kernel.img
kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')" kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')"
VERSION=$kvers+$(date +20%y%m%d.%H-%M) VERSION=$kvers
cat > meta/kernel.yaml <<EOF cat > meta/kernel.yaml <<EOF
version: $kvers version: $kvers