extract packaging changes from 4.4.6-1+rpi13 (e02140d83af8b48a23548fbb8ca7bc91fd510b78)

diff --git a/debian/changelog b/debian/changelog
index 0d5a3448f2a9eae3172005065a7b6c991e45af99..c7f32bed925de726c483d9700a5f31e9135b6cb1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+linux-4.4 (4.4.6-1+rpi13) jessie-staging; urgency=medium
+
+  * Remove more stuff from config.rpi because it's breaking udeb generation
+    + Remove "# CONFIG_CRYPTO_BLOWFISH is not set"
+    + Remove "# CONFIG_CRYPTO_SERPENT is not set"
+    + Remove "# CONFIG_CRYPTO_TWOFISH is not set"
+    + Remove "# CONFIG_MINIX_FS is not set"
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 May 2016 02:16:27 +0000
+
 linux-4.4 (4.4.6-1+rpi12) jessie-staging; urgency=medium
 
   * Merge config.test into config.rpi

diff --git a/debian/config/armhf/config.rpi b/debian/config/armhf/config.rpi
index d8a7462b794c2ca1c205345c1e5e2d5c9862130b..f4c0c545e0cdd09f03ad955bf6c809fe48aa3532 100644 (file)
--- a/debian/config/armhf/config.rpi
+++ b/debian/config/armhf/config.rpi
@@ -178,7 +178,6 @@ CONFIG_OID_REGISTRY=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 # CONFIG_LOGFS is not set
 # CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
@@ -240,7 +239,6 @@ CONFIG_OID_REGISTRY=y
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
 # CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_FCRYPT is not set
@@ -248,9 +246,7 @@ CONFIG_OID_REGISTRY=y
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set