From 03e157c09e7815afffdbf59bc0b130e8fbe12b59 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 3 Jan 2016 01:49:10 +0000 Subject: [PATCH 1/3] [armhf] udeb: Remove pbias-regulator module from mmc-modules (fixes FTBFS) It's now in core-modules. --- debian/changelog | 7 +++++++ debian/installer/armhf/modules/armhf-armmp/core-modules | 2 +- debian/installer/armhf/modules/armhf-armmp/mmc-modules | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2b7be29a..b327983e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.3.3-4) UNRELEASED; urgency=medium + + * [armhf] udeb: Remove pbias-regulator module from mmc-modules as it's now + in core-modules (fixes FTBFS) + + -- Ben Hutchings Sun, 03 Jan 2016 01:47:19 +0000 + linux (4.3.3-3) unstable; urgency=medium [ Ben Hutchings ] diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules index 4d0f60146..d2904689d 100644 --- a/debian/installer/armhf/modules/armhf-armmp/core-modules +++ b/debian/installer/armhf/modules/armhf-armmp/core-modules @@ -21,7 +21,7 @@ da9052-regulator ? gpio-regulator ? mc13783-regulator ? mc13892-regulator ? -pbias-regulator ? +pbias-regulator pfuze100-regulator ? s2mpa01 ? s2mps11 ? diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules index f0351e695..4ea063fc9 100644 --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules @@ -5,4 +5,3 @@ mmci omap_hsmmc sunxi-mmc dw_mmc-exynos -pbias-regulator From e72aee95c2f4a7c87d17d5c3ef80be88a24eb125 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 3 Jan 2016 01:49:50 +0000 Subject: [PATCH 2/3] [armhf] udeb: Remove duplicate listing of phy-sun4i-usb in usb-modules This is probably harmless but let's keep this list clean. --- debian/installer/armhf/modules/armhf-armmp/usb-modules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules index 0be12dd08..a6c3fc9fd 100644 --- a/debian/installer/armhf/modules/armhf-armmp/usb-modules +++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules @@ -1,5 +1,4 @@ #include -phy-sun4i-usb dwc3-exynos dwc3-omap ohci-exynos @@ -18,7 +17,7 @@ phy-exynos5-usbdrd ? phy-generic ? phy-mxs-usb phy-omap-usb2 -phy-sun4i-usb ? +phy-sun4i-usb phy-sun9i-usb ? phy-tegra-usb ? phy-twl4030-usb ? From bbfa58468df54735f35c9a12643132b294537643 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 3 Jan 2016 01:50:52 +0000 Subject: [PATCH 3/3] Prepare to release linux (4.3.3-4). --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b327983e4..72fedfb0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -linux (4.3.3-4) UNRELEASED; urgency=medium +linux (4.3.3-4) unstable; urgency=medium * [armhf] udeb: Remove pbias-regulator module from mmc-modules as it's now in core-modules (fixes FTBFS) - -- Ben Hutchings Sun, 03 Jan 2016 01:47:19 +0000 + -- Ben Hutchings Sun, 03 Jan 2016 01:50:52 +0000 linux (4.3.3-3) unstable; urgency=medium