From e588a3afcd8c1ff758a1578b47c37748ec2a73d8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 10 Aug 2018 14:05:51 +0100 Subject: [PATCH] Move disabling of broken features from d/p/series-orig to d/p/series Also fix fuzz on one of the patches (our private patch system allows one line of fuzz). --- debian/changelog | 1 + debian/patches/debian/dfsg/vs6624-disable.patch | 4 ++-- debian/patches/series | 7 +++++++ debian/patches/series-orig | 5 ----- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7883624c8..50b8c8f21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ linux (4.18~rc7-1~exp1) UNRELEASED; urgency=medium * debian/bin/genorig.py: Add support for debian/copyright Files-Excluded field * Move file exclusion from d/p/debian/dfsg/files-1 to d/copyright + * Move disabling of broken features from d/p/series-orig to d/p/series -- Uwe Kleine-König Sat, 21 Jul 2018 16:52:01 +0200 diff --git a/debian/patches/debian/dfsg/vs6624-disable.patch b/debian/patches/debian/dfsg/vs6624-disable.patch index 7a62d6bd3..6b213a6ff 100644 --- a/debian/patches/debian/dfsg/vs6624-disable.patch +++ b/debian/patches/debian/dfsg/vs6624-disable.patch @@ -5,8 +5,8 @@ Forwarded: not-needed --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig -@@ -422,6 +422,7 @@ config VIDEO_OV7670 - controller. +@@ -768,6 +768,7 @@ config VIDEO_OV13858 + OV13858 camera. config VIDEO_VS6624 + depends on BROKEN diff --git a/debian/patches/series b/debian/patches/series index 851d5940c..71d3f2c3b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,10 @@ +# Disable features broken by exclusion of upstream files +debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch +debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch +debian/dfsg/vs6624-disable.patch +debian/dfsg/drivers-net-appletalk-cops.patch +debian/dfsg/video-remove-nvidiafb-and-rivafb.patch + # Changes to support package build system debian/version.patch debian/uname-version-timestamp.patch diff --git a/debian/patches/series-orig b/debian/patches/series-orig index 9cff85aa7..e69de29bb 100644 --- a/debian/patches/series-orig +++ b/debian/patches/series-orig @@ -1,5 +0,0 @@ -+ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch -+ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch -+ debian/dfsg/vs6624-disable.patch -+ debian/dfsg/drivers-net-appletalk-cops.patch -+ debian/dfsg/video-remove-nvidiafb-and-rivafb.patch