extract packaging changes from 4.4.6-1+rpi12 (96ad38934b2a990852d69067b420a3f1db44b1aa)

diff --git a/debian/changelog b/debian/changelog
index 4be413814869c24b454fc5cd90729020c122cae6..0d5a3448f2a9eae3172005065a7b6c991e45af99 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux-4.4 (4.4.6-1+rpi12) jessie-staging; urgency=medium
+
+  * Merge config.test into config.rpi
+  * Allow loop drivers to be built as modules so udeb build succeeds.
+  * Remove CONFIG_FIRMWARE_IN_KERNEL from config.rpi
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 02 May 2016 14:59:12 +0000
+
 linux-4.4 (4.4.6-1+rpi11) jessie-staging; urgency=medium
 
   * Remove settings unshelved in +rpi5 and +rpi6

diff --git a/debian/config/armhf/config.rpi b/debian/config/armhf/config.rpi
index fc5f8694a30eece13700e78eb4a7d9f5815b5828..d8a7462b794c2ca1c205345c1e5e2d5c9862130b 100644 (file)
--- a/debian/config/armhf/config.rpi
+++ b/debian/config/armhf/config.rpi
@@ -11,6 +11,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_AES_ARM=m
 
 #Changes added during the move from 3.18 to 4.4 (bb6b4b6b331680bed807605685572d727638bb51 to af9619cc3b0e8f8dc1cb2aebe4c95c86d41d90e9)-- ../newconfig-rpix     2016-04-14 18:41:20.517825338 +0000
+#There are almost certainly more here than strictly needed but I got fed up with bisection.
 
 # CONFIG_CPU_SW_DOMAIN_PAN is not set
 # CONFIG_ATAGS is not set
@@ -102,3 +103,160 @@ CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SMB2=y
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
+
+CONFIG_KERNEL_GZIP=y
+CONFIG_USELIB=y
+CONFIG_TINY_RCU=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_OPTPROBES=y
+CONFIG_MAC_PARTITION=y
+CONFIG_OABI_COMPAT=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_HAMRADIO=y
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_YAM=m
+CONFIG_IRDA=m
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRTTY_SIR=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_OID_REGISTRY=y
+
+# CONFIG_MEMORY is not set
+# CONFIG_IIO_TRIGGER is not set
+# CONFIG_EXT4_ENCRYPTION is not set
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
+# CONFIG_F2FS_FS_SECURITY is not set
+# CONFIG_F2FS_FS_ENCRYPTION is not set
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+# CONFIG_PROC_CHILDREN is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+# CONFIG_JFFS2_LZO is not set
+# 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
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFSD_PNFS is not set
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_SECURITY is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_DLM_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_KPROBE_EVENT is not set
+# CONFIG_UPROBE_EVENT is not set
+# CONFIG_PROBE_EVENTS is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_KGDB_TESTS is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_CRC32 is not set
+# CONFIG_CRYPTO_CRCT10DIF is not set
+# CONFIG_CRYPTO_POLY1305 is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# 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
+# CONFIG_CRYPTO_KHAZAD is not set
+# 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
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_AEAD is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CORDIC is not set

diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 7d6929213cbd46261303997bbb5b8a714505a208..c876dbfd754a5ee451f3049696983a379e645999 100644 (file)
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -44,7 +44,6 @@ hardware-long: Raspberry PI
 [rpi_image]
 configs:
  armhf/config.rpix
- armhf/config.test
  armhf/config.rpi
 
 [rpi2_image]