mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-10 16:24:07 +00:00
feat: add ubuntu-oem project for oem images
This commit is contained in:
parent
448defa7f3
commit
1038f94330
10
debian/changelog
vendored
10
debian/changelog
vendored
@ -1,3 +1,13 @@
|
|||||||
|
livecd-rootfs (2.900) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Add ubuntu-oem build project:
|
||||||
|
- auto/config: Make ubuntu-oem project available, and runs make-hooks like
|
||||||
|
ubuntu-cpc.
|
||||||
|
- live-build/ubuntu-oem: Create the directory for ubuntu-oem project, and
|
||||||
|
link make-hooks from ubuntu-cpc into it.
|
||||||
|
|
||||||
|
-- Yao Wei (魏銘廷) <yao.wei@canonical.com> Wed, 12 Jul 2023 11:01:07 +0800
|
||||||
|
|
||||||
livecd-rootfs (2.899) mantic; urgency=medium
|
livecd-rootfs (2.899) mantic; urgency=medium
|
||||||
|
|
||||||
* ubuntu-cpc: Revert mount ESP on /boot and bind mount /boot on /boot/efi
|
* ubuntu-cpc: Revert mount ESP on /boot and bind mount /boot on /boot/efi
|
||||||
|
@ -550,6 +550,8 @@ case $IMAGEFORMAT in
|
|||||||
add_package live casper
|
add_package live casper
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
ubuntu-oem)
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
add_package live casper
|
add_package live casper
|
||||||
;;
|
;;
|
||||||
@ -810,6 +812,30 @@ case $PROJECT in
|
|||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
ubuntu-oem)
|
||||||
|
touch config/universe-enabled
|
||||||
|
PASSES_TO_LAYERS="true"
|
||||||
|
#KERNEL_FLAVOURS='oem-22.04'
|
||||||
|
KERNEL_FLAVOURS='generic-hwe-22.04'
|
||||||
|
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
|
||||||
|
add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
|
||||||
|
add_task minimal.standard.live ubuntu-live
|
||||||
|
add_package minimal cloud-init
|
||||||
|
remove_package minimal.standard.live ubiquity-frontend-gtk
|
||||||
|
add_snap minimal.standard.live ubuntu-desktop-installer/classic
|
||||||
|
|
||||||
|
cat <<-EOF > config/minimal.standard.catalog-in.yaml
|
||||||
|
name: "Ubuntu Desktop for OEM"
|
||||||
|
description: >-
|
||||||
|
Ubuntu Desktop for OEM preinstallation.
|
||||||
|
id: ubuntu-desktop-oem
|
||||||
|
type: fsimage-layered
|
||||||
|
variant: desktop
|
||||||
|
locale_support: none
|
||||||
|
default: yes
|
||||||
|
EOF
|
||||||
|
;;
|
||||||
|
|
||||||
kubuntu|kubuntu-dvd)
|
kubuntu|kubuntu-dvd)
|
||||||
add_task install minimal standard
|
add_task install minimal standard
|
||||||
add_task install kubuntu-desktop
|
add_task install kubuntu-desktop
|
||||||
@ -1529,7 +1555,8 @@ EOF
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled|ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:canary)
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
||||||
|
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:canary|ubuntu-oem:*)
|
||||||
# Ensure that most things e.g. includes.chroot are copied as is
|
# Ensure that most things e.g. includes.chroot are copied as is
|
||||||
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
||||||
case $entry in
|
case $entry in
|
||||||
@ -1545,7 +1572,7 @@ EOF
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$PROJECT" = "ubuntu-cpc" ]; then
|
if [ "$PROJECT" = "ubuntu-cpc" ] || [ "$PROJECT" = "ubuntu-oem" ] ; then
|
||||||
case ${IMAGE_TARGETS:-} in
|
case ${IMAGE_TARGETS:-} in
|
||||||
"")
|
"")
|
||||||
config/hooks.d/make-hooks --hooks-dir config/hooks all
|
config/hooks.d/make-hooks --hooks-dir config/hooks all
|
||||||
|
1
live-build/ubuntu-oem/hooks.d/make-hooks
Symbolic link
1
live-build/ubuntu-oem/hooks.d/make-hooks
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../ubuntu-cpc/hooks.d/make-hooks
|
Loading…
x
Reference in New Issue
Block a user