diff mbox series

[Bionic,deb-to-snap,master] deb to snap: add nvme and hid modules to initrd for amd64

Message ID 20181123095657.10634-1-jesse.sung@canonical.com
State New
Headers show
Series [Bionic,deb-to-snap,master] deb to snap: add nvme and hid modules to initrd for amd64 | expand

Commit Message

Wen-chien Jesse Sung Nov. 23, 2018, 9:56 a.m. UTC
BugLink: https://launchpad.net/bugs/1802260

Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Paolo Pisati Dec. 5, 2018, 8:52 a.m. UTC | #1
Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
On Fri, Nov 23, 2018 at 10:57 AM Wen-chien Jesse Sung
<jesse.sung@canonical.com> wrote:
>
> BugLink: https://launchpad.net/bugs/1802260
>
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
>  Makefile | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 580189d..9c9a58c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -77,6 +77,11 @@ all:
>         echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/ubuntu-core.conf
>         # LP1794279: vc4-kms-v3d and hardware accelerated framebuffer support
>         echo "i2c-bcm2708" > chroot/etc/initramfs-tools/modules
> +       if [ "$(DPKG_ARCH)" = "amd64" ]; then \
> +         echo "nvme" >> chroot/etc/initramfs-tools/modules; \
> +         echo "usbhid" >> chroot/etc/initramfs-tools/modules; \
> +         echo "hid-generic" >> chroot/etc/initramfs-tools/modules; \
> +       fi
>         $(ENV) chroot chroot apt-get -y --allow-insecure-repositories update
>         $(ENV) chroot chroot apt-get -y --allow-unauthenticated install initramfs-tools-ubuntu-core linux-firmware xz-utils
>         mount --bind /proc chroot/proc
> --
> 2.19.1
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Kleber Sacilotto de Souza Dec. 6, 2018, 2:05 p.m. UTC | #2
On 11/23/18 10:56 AM, Wen-chien Jesse Sung wrote:
> BugLink: https://launchpad.net/bugs/1802260
>
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
> ---
>  Makefile | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 580189d..9c9a58c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -77,6 +77,11 @@ all:
>  	echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/ubuntu-core.conf
>  	# LP1794279: vc4-kms-v3d and hardware accelerated framebuffer support
>  	echo "i2c-bcm2708" > chroot/etc/initramfs-tools/modules
> +	if [ "$(DPKG_ARCH)" = "amd64" ]; then \
> +	  echo "nvme" >> chroot/etc/initramfs-tools/modules; \
> +	  echo "usbhid" >> chroot/etc/initramfs-tools/modules; \
> +	  echo "hid-generic" >> chroot/etc/initramfs-tools/modules; \
> +	fi
>  	$(ENV) chroot chroot apt-get -y --allow-insecure-repositories update
>  	$(ENV) chroot chroot apt-get -y --allow-unauthenticated install initramfs-tools-ubuntu-core linux-firmware xz-utils
>  	mount --bind /proc chroot/proc
Kleber Sacilotto de Souza Dec. 6, 2018, 2:11 p.m. UTC | #3
On 11/23/18 10:56 AM, Wen-chien Jesse Sung wrote:
> BugLink: https://launchpad.net/bugs/1802260
>
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
>  Makefile | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 580189d..9c9a58c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -77,6 +77,11 @@ all:
>  	echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/ubuntu-core.conf
>  	# LP1794279: vc4-kms-v3d and hardware accelerated framebuffer support
>  	echo "i2c-bcm2708" > chroot/etc/initramfs-tools/modules
> +	if [ "$(DPKG_ARCH)" = "amd64" ]; then \
> +	  echo "nvme" >> chroot/etc/initramfs-tools/modules; \
> +	  echo "usbhid" >> chroot/etc/initramfs-tools/modules; \
> +	  echo "hid-generic" >> chroot/etc/initramfs-tools/modules; \
> +	fi
>  	$(ENV) chroot chroot apt-get -y --allow-insecure-repositories update
>  	$(ENV) chroot chroot apt-get -y --allow-unauthenticated install initramfs-tools-ubuntu-core linux-firmware xz-utils
>  	mount --bind /proc chroot/proc

Applied to linux-snap/bionic/master branch.

Thanks,
Kleber
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 580189d..9c9a58c 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,11 @@  all:
 	echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/ubuntu-core.conf
 	# LP1794279: vc4-kms-v3d and hardware accelerated framebuffer support
 	echo "i2c-bcm2708" > chroot/etc/initramfs-tools/modules
+	if [ "$(DPKG_ARCH)" = "amd64" ]; then \
+	  echo "nvme" >> chroot/etc/initramfs-tools/modules; \
+	  echo "usbhid" >> chroot/etc/initramfs-tools/modules; \
+	  echo "hid-generic" >> chroot/etc/initramfs-tools/modules; \
+	fi
 	$(ENV) chroot chroot apt-get -y --allow-insecure-repositories update
 	$(ENV) chroot chroot apt-get -y --allow-unauthenticated install initramfs-tools-ubuntu-core linux-firmware xz-utils
 	mount --bind /proc chroot/proc