From a99ca47633baecc60e53428afcd729296cca0f5d Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 11:31:58 +0100 Subject: [PATCH 01/10] linux: Add LTS version 4.9.68 --- linux-4.9.68-193.bee | 83 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 linux-4.9.68-193.bee diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee new file mode 100755 index 000000000..0d14f9df8 --- /dev/null +++ b/linux-4.9.68-193.bee @@ -0,0 +1,83 @@ +#!/bin/env beesh + +# note: CONFIG=/boot/config-WHATEVER BEE_MAKEFLAGS='-j 40' ./linux-xxx.bee + +KERNELVERSION=${PKGVERSION} +if [ -z "${PKGVERSION[3]}" ] ; then + KERNELVERSION=${KERNELVERSION}.0 +fi + +# append extra version to get for example 4.8.0-rc4 +KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} + +echo $KERNELVERSION + +SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}${PKGEXTRAVERSION_DASH}.tar.xz" + +PATCHURL+=(/src/mariux/patches/0001-iomap-fix-integer-truncation-issues-in-the-zeroing-a.patch) +PATCHURL+=(/src/mariux/patches/linux-0001-SUNRPC-Refactor-svc_set_num_threads.patch) +PATCHURL+=(/src/mariux/patches/linux-0002-NFSv4-Fix-callback-server-shutdown.patch) + +# EXCLUDE="" + +#CONFIG= + +KERNELLOCAL=".mx64.${PKGREVISION}" +FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" + +B=${S} + +mee_patch() { + echo "PATCH $@" + bee_patch $@ +} + +mee_configure() { + echo "configure $@" + if [ -e /proc/config.gz ] ; then + zcat /proc/config.gz >config-current + RUNNING=config-current + else + RUNNING=/boot/config-$(uname -r) + fi + + : ${CONFIG:=${RUNNING}} + + if [ ! -e ${CONFIG} ] ; then + echo "can't find config '${CONFIG}'" + exit 1 + fi + + cp -v ${CONFIG} .config + + LOCALVERSION="\"${KERNELLOCAL}\"" + sed -i -e "s@CONFIG_LOCALVERSION=.*@CONFIG_LOCALVERSION=${LOCALVERSION}@" .config + + echo "doing make -C ${S} olddefconfig in ${PWD} .." + + make olddefconfig + + echo "doing make -C ${S} menuconfig in ${PWD} .." + + make menuconfig +} + +mee_build() { + echo "build $@" + make ${BEE_MAKEFLAGS} +} + +mee_install() { + echo "install $@" + + make modules_install INSTALL_MOD_PATH=${D} + make install INSTALL_PATH=${D}/boot +# make firmware_install INSTALL_MOD_PATH=${D} + + rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} + + ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source + ln -sv /usr/src/linux/${PKGALLPKG}/build ${D}/lib/modules/${FULLKERNELVERSION}/build + + ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION} +} From 10c06e8d230441ee96843ba6e4af1874886bffba Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 11:35:40 +0100 Subject: [PATCH 02/10] linux-4.9.68: Remove obsolete patches These three backported patches are already included in 4.9.68. --- linux-4.9.68-193.bee | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 0d14f9df8..43758ac59 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -14,9 +14,7 @@ echo $KERNELVERSION SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}${PKGEXTRAVERSION_DASH}.tar.xz" -PATCHURL+=(/src/mariux/patches/0001-iomap-fix-integer-truncation-issues-in-the-zeroing-a.patch) -PATCHURL+=(/src/mariux/patches/linux-0001-SUNRPC-Refactor-svc_set_num_threads.patch) -PATCHURL+=(/src/mariux/patches/linux-0002-NFSv4-Fix-callback-server-shutdown.patch) +PATCHURL+=() # EXCLUDE="" From d8a935ebfecd58248ace3d2f91b541210cd1abb2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 11:59:04 +0100 Subject: [PATCH 03/10] linux-4.9.68: Check for existing revision number We want our kernel revision numbers to be unique over all linux kernel packages. Avoid conflicts by doing a quick check against the available bee files. Patch by Thomas Kreitler --- linux-4.9.68-193.bee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 43758ac59..b7e25db05 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -25,6 +25,9 @@ FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" B=${S} +ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null \ + && echo "A kernel with revision ${PKGREVISION} has already been build." && exit + mee_patch() { echo "PATCH $@" bee_patch $@ From 56e54d3bd18488bb8941783b860fe37e35fa72d4 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 14:40:13 +0100 Subject: [PATCH 04/10] linux-4.9.68: Improve error message for existing kernel revision Include the names of the conflicting files in the error message. --- linux-4.9.68-193.bee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index b7e25db05..6eb8f4bc4 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -25,8 +25,9 @@ FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" B=${S} -ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null \ - && echo "A kernel with revision ${PKGREVISION} has already been build." && exit +same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null) \ + && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \ + && exit mee_patch() { echo "PATCH $@" From e3b63c216ae52591aa7905960646b2b3d79af811 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 13 Dec 2017 16:37:37 +0100 Subject: [PATCH 05/10] linux-4.9.68: Import config Include kernel config in the bee file, so that we can better track config changes. The set of non-default config options was generated with `make savedefconfig`. --- linux-4.9.68-193.bee | 795 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 770 insertions(+), 25 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 6eb8f4bc4..ed611abfa 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -36,32 +36,777 @@ mee_patch() { mee_configure() { echo "configure $@" - if [ -e /proc/config.gz ] ; then - zcat /proc/config.gz >config-current - RUNNING=config-current - else - RUNNING=/boot/config-$(uname -r) - fi - - : ${CONFIG:=${RUNNING}} - - if [ ! -e ${CONFIG} ] ; then - echo "can't find config '${CONFIG}'" - exit 1 - fi - - cp -v ${CONFIG} .config - - LOCALVERSION="\"${KERNELLOCAL}\"" - sed -i -e "s@CONFIG_LOCALVERSION=.*@CONFIG_LOCALVERSION=${LOCALVERSION}@" .config - - echo "doing make -C ${S} olddefconfig in ${PWD} .." - + cat >.config <<-EOF + CONFIG_LOCALVERSION="$KERNELLOCAL" + CONFIG_KERNEL_BZIP2=y + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y + CONFIG_AUDIT=y + CONFIG_HIGH_RES_TIMERS=y + CONFIG_BSD_PROCESS_ACCT=y + CONFIG_BSD_PROCESS_ACCT_V3=y + CONFIG_TASK_XACCT=y + CONFIG_TASK_IO_ACCOUNTING=y + CONFIG_IKCONFIG=y + CONFIG_IKCONFIG_PROC=y + CONFIG_CGROUPS=y + CONFIG_MEMCG=y + CONFIG_MEMCG_SWAP=y + CONFIG_BLK_CGROUP=y + CONFIG_CGROUP_SCHED=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_RT_GROUP_SCHED=y + CONFIG_CGROUP_PIDS=y + CONFIG_CGROUP_FREEZER=y + CONFIG_CGROUP_HUGETLB=y + CONFIG_CPUSETS=y + CONFIG_CGROUP_DEVICE=y + CONFIG_CGROUP_CPUACCT=y + CONFIG_CGROUP_PERF=y + CONFIG_CGROUP_DEBUG=y + CONFIG_USER_NS=y + CONFIG_BLK_DEV_INITRD=y + CONFIG_SLAB=y + CONFIG_MODULES=y + CONFIG_MODULE_UNLOAD=y + CONFIG_MODULE_FORCE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_BLK_DEV_INTEGRITY=y + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y + CONFIG_BSD_DISKLABEL=y + CONFIG_LDM_PARTITION=y + CONFIG_CFQ_GROUP_IOSCHED=y + CONFIG_SMP=y + CONFIG_IOSF_MBI=m + CONFIG_GART_IOMMU=y + CONFIG_NR_CPUS=256 + CONFIG_PREEMPT_VOLUNTARY=y + CONFIG_MICROCODE_AMD=y + CONFIG_NUMA=y + CONFIG_TRANSPARENT_HUGEPAGE=y + CONFIG_HZ_1000=y + CONFIG_KEXEC=y + CONFIG_KEXEC_FILE=y + # CONFIG_RELOCATABLE is not set + CONFIG_PHYSICAL_ALIGN=0x1000000 + CONFIG_COMPAT_VDSO=y + CONFIG_CMDLINE_BOOL=y + CONFIG_CMDLINE="init=/bin/systemd" + # CONFIG_ACPI_AC is not set + # CONFIG_ACPI_BATTERY is not set + CONFIG_ACPI_DOCK=y + CONFIG_CPU_IDLE_GOV_MENU=y + CONFIG_PCI_MMCONFIG=y + CONFIG_PCIEPORTBUS=y + CONFIG_PCI_IOV=y + # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set + CONFIG_BINFMT_MISC=y + CONFIG_IA32_EMULATION=y + CONFIG_IA32_AOUT=y + CONFIG_NET=y + CONFIG_PACKET=m + CONFIG_PACKET_DIAG=m + CONFIG_UNIX=m + CONFIG_UNIX_DIAG=m + CONFIG_XFRM_USER=m + CONFIG_INET=y + CONFIG_IP_MULTICAST=y + CONFIG_IP_ADVANCED_ROUTER=y + CONFIG_IP_FIB_TRIE_STATS=y + CONFIG_IP_MULTIPLE_TABLES=y + CONFIG_IP_ROUTE_MULTIPATH=y + CONFIG_IP_ROUTE_VERBOSE=y + CONFIG_NET_IPIP=m + CONFIG_NET_IPGRE_DEMUX=m + CONFIG_NET_IPGRE=m + CONFIG_NET_IPGRE_BROADCAST=y + CONFIG_IP_MROUTE=y + CONFIG_IP_MROUTE_MULTIPLE_TABLES=y + CONFIG_IP_PIMSM_V1=y + CONFIG_IP_PIMSM_V2=y + CONFIG_NET_IPVTI=m + CONFIG_NET_FOU_IP_TUNNELS=y + CONFIG_INET_AH=m + CONFIG_INET_ESP=m + CONFIG_INET_IPCOMP=m + CONFIG_INET_XFRM_MODE_TRANSPORT=m + CONFIG_INET_XFRM_MODE_TUNNEL=m + CONFIG_INET_XFRM_MODE_BEET=m + CONFIG_INET_DIAG=m + CONFIG_INET_UDP_DIAG=m + CONFIG_TCP_CONG_ADVANCED=y + CONFIG_TCP_CONG_HSTCP=m + CONFIG_TCP_CONG_HYBLA=m + CONFIG_TCP_CONG_SCALABLE=m + CONFIG_TCP_CONG_LP=m + CONFIG_TCP_CONG_VENO=m + CONFIG_TCP_CONG_YEAH=m + CONFIG_TCP_CONG_ILLINOIS=m + CONFIG_TCP_CONG_DCTCP=m + CONFIG_TCP_CONG_CDG=m + CONFIG_TCP_MD5SIG=y + CONFIG_IPV6=m + CONFIG_IPV6_ROUTER_PREF=y + CONFIG_IPV6_ROUTE_INFO=y + CONFIG_IPV6_OPTIMISTIC_DAD=y + CONFIG_INET6_AH=m + CONFIG_INET6_ESP=m + CONFIG_INET6_IPCOMP=m + CONFIG_IPV6_MIP6=m + CONFIG_IPV6_ILA=m + CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m + CONFIG_IPV6_VTI=m + CONFIG_IPV6_SIT_6RD=y + CONFIG_IPV6_GRE=m + CONFIG_IPV6_MULTIPLE_TABLES=y + CONFIG_IPV6_SUBTREES=y + CONFIG_IPV6_MROUTE=y + CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y + CONFIG_IPV6_PIMSM_V2=y + CONFIG_NETFILTER=y + CONFIG_NF_CONNTRACK=m + CONFIG_NF_CONNTRACK_ZONES=y + CONFIG_NF_CONNTRACK_EVENTS=y + CONFIG_NF_CONNTRACK_TIMEOUT=y + CONFIG_NF_CONNTRACK_TIMESTAMP=y + CONFIG_NF_CT_PROTO_UDPLITE=m + CONFIG_NF_CONNTRACK_AMANDA=m + CONFIG_NF_CONNTRACK_FTP=m + CONFIG_NF_CONNTRACK_H323=m + CONFIG_NF_CONNTRACK_IRC=m + CONFIG_NF_CONNTRACK_NETBIOS_NS=m + CONFIG_NF_CONNTRACK_SNMP=m + CONFIG_NF_CONNTRACK_PPTP=m + CONFIG_NF_CONNTRACK_SANE=m + CONFIG_NF_CONNTRACK_SIP=m + CONFIG_NF_CONNTRACK_TFTP=m + CONFIG_NF_CT_NETLINK=m + CONFIG_NF_CT_NETLINK_TIMEOUT=m + CONFIG_NF_CT_NETLINK_HELPER=m + CONFIG_NETFILTER_NETLINK_GLUE_CT=y + CONFIG_NF_TABLES=m + CONFIG_NF_TABLES_INET=m + CONFIG_NF_TABLES_NETDEV=m + CONFIG_NFT_EXTHDR=m + CONFIG_NFT_META=m + CONFIG_NFT_CT=m + CONFIG_NFT_COUNTER=m + CONFIG_NFT_LOG=m + CONFIG_NFT_LIMIT=m + CONFIG_NFT_MASQ=m + CONFIG_NFT_REDIR=m + CONFIG_NFT_NAT=m + CONFIG_NFT_QUEUE=m + CONFIG_NFT_REJECT=m + CONFIG_NFT_COMPAT=m + CONFIG_NFT_HASH=m + CONFIG_NETFILTER_XTABLES=y + CONFIG_NETFILTER_XT_SET=m + CONFIG_NETFILTER_XT_TARGET_AUDIT=m + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m + CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m + CONFIG_NETFILTER_XT_TARGET_CONNMARK=m + CONFIG_NETFILTER_XT_TARGET_DSCP=m + CONFIG_NETFILTER_XT_TARGET_HMARK=m + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m + CONFIG_NETFILTER_XT_TARGET_LOG=m + CONFIG_NETFILTER_XT_TARGET_MARK=m + CONFIG_NETFILTER_XT_TARGET_NFLOG=m + CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m + CONFIG_NETFILTER_XT_TARGET_TEE=m + CONFIG_NETFILTER_XT_TARGET_TPROXY=m + CONFIG_NETFILTER_XT_TARGET_TRACE=m + CONFIG_NETFILTER_XT_TARGET_TCPMSS=m + CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m + CONFIG_NETFILTER_XT_MATCH_BPF=m + CONFIG_NETFILTER_XT_MATCH_CGROUP=m + CONFIG_NETFILTER_XT_MATCH_CLUSTER=m + CONFIG_NETFILTER_XT_MATCH_COMMENT=m + CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m + CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m + CONFIG_NETFILTER_XT_MATCH_CONNMARK=m + CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m + CONFIG_NETFILTER_XT_MATCH_CPU=m + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m + CONFIG_NETFILTER_XT_MATCH_DSCP=m + CONFIG_NETFILTER_XT_MATCH_ECN=y + CONFIG_NETFILTER_XT_MATCH_ESP=m + CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + CONFIG_NETFILTER_XT_MATCH_HELPER=m + CONFIG_NETFILTER_XT_MATCH_HL=y + CONFIG_NETFILTER_XT_MATCH_IPCOMP=m + CONFIG_NETFILTER_XT_MATCH_IPRANGE=m + CONFIG_NETFILTER_XT_MATCH_IPVS=m + CONFIG_NETFILTER_XT_MATCH_LENGTH=m + CONFIG_NETFILTER_XT_MATCH_LIMIT=m + CONFIG_NETFILTER_XT_MATCH_MAC=m + CONFIG_NETFILTER_XT_MATCH_MARK=m + CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m + CONFIG_NETFILTER_XT_MATCH_NFACCT=m + CONFIG_NETFILTER_XT_MATCH_OSF=m + CONFIG_NETFILTER_XT_MATCH_OWNER=m + CONFIG_NETFILTER_XT_MATCH_POLICY=m + CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m + CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m + CONFIG_NETFILTER_XT_MATCH_QUOTA=m + CONFIG_NETFILTER_XT_MATCH_RATEEST=m + CONFIG_NETFILTER_XT_MATCH_REALM=m + CONFIG_NETFILTER_XT_MATCH_RECENT=m + CONFIG_NETFILTER_XT_MATCH_SOCKET=m + CONFIG_NETFILTER_XT_MATCH_STATE=m + CONFIG_NETFILTER_XT_MATCH_STATISTIC=m + CONFIG_NETFILTER_XT_MATCH_STRING=m + CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + CONFIG_NETFILTER_XT_MATCH_TIME=m + CONFIG_NETFILTER_XT_MATCH_U32=y + CONFIG_IP_SET=m + CONFIG_IP_SET_BITMAP_IP=m + CONFIG_IP_SET_BITMAP_IPMAC=m + CONFIG_IP_SET_BITMAP_PORT=m + CONFIG_IP_SET_HASH_IP=m + CONFIG_IP_SET_HASH_IPMARK=m + CONFIG_IP_SET_HASH_IPPORT=m + CONFIG_IP_SET_HASH_IPPORTIP=m + CONFIG_IP_SET_HASH_IPPORTNET=m + CONFIG_IP_SET_HASH_MAC=m + CONFIG_IP_SET_HASH_NETPORTNET=m + CONFIG_IP_SET_HASH_NET=m + CONFIG_IP_SET_HASH_NETNET=m + CONFIG_IP_SET_HASH_NETPORT=m + CONFIG_IP_SET_HASH_NETIFACE=m + CONFIG_IP_SET_LIST_SET=m + CONFIG_IP_VS=m + CONFIG_IP_VS_RR=m + CONFIG_IP_VS_NFCT=y + CONFIG_NF_CONNTRACK_IPV4=m + CONFIG_NFT_CHAIN_ROUTE_IPV4=m + CONFIG_NFT_DUP_IPV4=m + CONFIG_NF_TABLES_ARP=m + CONFIG_NF_LOG_ARP=m + CONFIG_NFT_CHAIN_NAT_IPV4=m + CONFIG_NFT_MASQ_IPV4=m + CONFIG_NFT_REDIR_IPV4=m + CONFIG_IP_NF_IPTABLES=m + CONFIG_IP_NF_MATCH_AH=m + CONFIG_IP_NF_MATCH_ECN=m + CONFIG_IP_NF_MATCH_RPFILTER=m + CONFIG_IP_NF_MATCH_TTL=m + CONFIG_IP_NF_FILTER=m + CONFIG_IP_NF_TARGET_REJECT=m + CONFIG_IP_NF_TARGET_SYNPROXY=m + CONFIG_IP_NF_NAT=m + CONFIG_IP_NF_TARGET_MASQUERADE=m + CONFIG_IP_NF_TARGET_NETMAP=m + CONFIG_IP_NF_TARGET_REDIRECT=m + CONFIG_IP_NF_MANGLE=m + CONFIG_IP_NF_TARGET_CLUSTERIP=m + CONFIG_IP_NF_TARGET_ECN=m + CONFIG_IP_NF_TARGET_TTL=m + CONFIG_IP_NF_RAW=m + CONFIG_IP_NF_ARPTABLES=m + CONFIG_IP_NF_ARPFILTER=m + CONFIG_IP_NF_ARP_MANGLE=m + CONFIG_NF_CONNTRACK_IPV6=m + CONFIG_NFT_CHAIN_ROUTE_IPV6=m + CONFIG_NFT_DUP_IPV6=m + CONFIG_NFT_CHAIN_NAT_IPV6=m + CONFIG_NFT_MASQ_IPV6=m + CONFIG_NFT_REDIR_IPV6=m + CONFIG_IP6_NF_IPTABLES=m + CONFIG_IP6_NF_MATCH_AH=m + CONFIG_IP6_NF_MATCH_EUI64=m + CONFIG_IP6_NF_MATCH_FRAG=m + CONFIG_IP6_NF_MATCH_OPTS=m + CONFIG_IP6_NF_MATCH_HL=m + CONFIG_IP6_NF_MATCH_IPV6HEADER=m + CONFIG_IP6_NF_MATCH_MH=m + CONFIG_IP6_NF_MATCH_RPFILTER=m + CONFIG_IP6_NF_MATCH_RT=m + CONFIG_IP6_NF_TARGET_HL=m + CONFIG_IP6_NF_FILTER=m + CONFIG_IP6_NF_TARGET_REJECT=m + CONFIG_IP6_NF_TARGET_SYNPROXY=m + CONFIG_IP6_NF_MANGLE=m + CONFIG_IP6_NF_RAW=m + CONFIG_IP6_NF_NAT=m + CONFIG_IP6_NF_TARGET_MASQUERADE=m + CONFIG_IP6_NF_TARGET_NPT=m + CONFIG_NF_TABLES_BRIDGE=m + CONFIG_BRIDGE_NF_EBTABLES=m + CONFIG_IP_DCCP=m + CONFIG_RDS=m + CONFIG_RDS_TCP=m + CONFIG_TIPC=m + CONFIG_L2TP=m + CONFIG_L2TP_V3=y + CONFIG_L2TP_IP=m + CONFIG_L2TP_ETH=m + CONFIG_BRIDGE=m + CONFIG_BRIDGE_VLAN_FILTERING=y + CONFIG_VLAN_8021Q=m + CONFIG_VLAN_8021Q_GVRP=y + CONFIG_VLAN_8021Q_MVRP=y + CONFIG_NET_SCHED=y + CONFIG_NET_SCH_CBQ=m + CONFIG_NET_SCH_HTB=m + CONFIG_NET_SCH_HFSC=m + CONFIG_NET_SCH_PRIO=m + CONFIG_NET_SCH_MULTIQ=m + CONFIG_NET_SCH_RED=m + CONFIG_NET_SCH_SFB=m + CONFIG_NET_SCH_SFQ=m + CONFIG_NET_SCH_TEQL=m + CONFIG_NET_SCH_TBF=m + CONFIG_NET_SCH_GRED=m + CONFIG_NET_SCH_DSMARK=m + CONFIG_NET_SCH_NETEM=m + CONFIG_NET_SCH_DRR=m + CONFIG_NET_SCH_MQPRIO=m + CONFIG_NET_SCH_CHOKE=m + CONFIG_NET_SCH_QFQ=m + CONFIG_NET_SCH_CODEL=m + CONFIG_NET_SCH_FQ_CODEL=m + CONFIG_NET_SCH_FQ=m + CONFIG_NET_SCH_HHF=m + CONFIG_NET_SCH_PIE=m + CONFIG_NET_SCH_PLUG=m + CONFIG_NET_CLS_BASIC=m + CONFIG_NET_CLS_TCINDEX=m + CONFIG_NET_CLS_ROUTE4=m + CONFIG_NET_CLS_FW=m + CONFIG_NET_CLS_U32=m + CONFIG_CLS_U32_PERF=y + CONFIG_CLS_U32_MARK=y + CONFIG_NET_CLS_RSVP=m + CONFIG_NET_CLS_RSVP6=m + CONFIG_NET_CLS_FLOW=m + CONFIG_NET_CLS_CGROUP=m + CONFIG_NET_CLS_BPF=m + CONFIG_NET_CLS_FLOWER=m + CONFIG_NET_EMATCH=y + CONFIG_NET_EMATCH_CMP=m + CONFIG_NET_EMATCH_NBYTE=m + CONFIG_NET_EMATCH_U32=m + CONFIG_NET_EMATCH_META=m + CONFIG_NET_EMATCH_TEXT=m + CONFIG_NET_CLS_ACT=y + CONFIG_NET_ACT_POLICE=m + CONFIG_NET_ACT_GACT=m + CONFIG_GACT_PROB=y + CONFIG_NET_ACT_MIRRED=m + CONFIG_NET_ACT_IPT=m + CONFIG_NET_ACT_NAT=m + CONFIG_NET_ACT_PEDIT=m + CONFIG_NET_ACT_SIMP=m + CONFIG_NET_ACT_SKBEDIT=m + CONFIG_NET_ACT_CSUM=m + CONFIG_NET_ACT_VLAN=m + CONFIG_NET_ACT_BPF=m + CONFIG_NET_ACT_CONNMARK=m + CONFIG_NET_CLS_IND=y + CONFIG_DNS_RESOLVER=y + CONFIG_NETLINK_DIAG=m + CONFIG_CGROUP_NET_PRIO=y + CONFIG_BT=m + CONFIG_BT_HCIBTUSB=m + CONFIG_BT_HCIUART=m + CONFIG_BT_HCIUART_BCSP=y + CONFIG_BT_HCIUART_ATH3K=y + CONFIG_BT_HCIUART_LL=y + CONFIG_BT_HCIUART_3WIRE=y + CONFIG_BT_HCIUART_INTEL=y + CONFIG_BT_HCIUART_BCM=y + CONFIG_BT_HCIUART_QCA=y + CONFIG_BT_HCIBCM203X=m + CONFIG_BT_HCIBPA10X=m + CONFIG_BT_HCIBFUSB=m + CONFIG_BT_HCIVHCI=m + CONFIG_BT_MRVL=m + CONFIG_BT_ATH3K=m + # CONFIG_WIRELESS is not set + CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y + CONFIG_CONNECTOR=y + CONFIG_PARPORT=y + CONFIG_PARPORT_PC=y + CONFIG_BLK_DEV_FD=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_BLK_DEV_CRYPTOLOOP=y + CONFIG_BLK_DEV_DRBD=y + CONFIG_BLK_DEV_NBD=y + CONFIG_BLK_DEV_RAM=y + CONFIG_CDROM_PKTCDVD=y + CONFIG_ENCLOSURE_SERVICES=y + CONFIG_IDE=y + CONFIG_BLK_DEV_IDECD=y + CONFIG_IDE_GENERIC=y + CONFIG_BLK_DEV_CMD640=y + CONFIG_BLK_DEV_GENERIC=y + CONFIG_BLK_DEV_RZ1000=y + CONFIG_BLK_DEV_AMD74XX=y + CONFIG_BLK_DEV_JMICRON=y + CONFIG_BLK_DEV_SIS5513=y + CONFIG_BLK_DEV_SD=y + CONFIG_BLK_DEV_SR=y + CONFIG_BLK_DEV_SR_VENDOR=y + CONFIG_CHR_DEV_SG=y + CONFIG_SCSI_ENCLOSURE=y + CONFIG_SCSI_CONSTANTS=y + CONFIG_SCSI_LOGGING=y + CONFIG_SCSI_SCAN_ASYNC=y + CONFIG_SCSI_FC_ATTRS=y + CONFIG_SCSI_SAS_LIBSAS=y + CONFIG_SCSI_SAS_ATA=y + CONFIG_ISCSI_TCP=m + CONFIG_BLK_DEV_3W_XXXX_RAID=m + CONFIG_SCSI_HPSA=y + CONFIG_SCSI_3W_9XXX=m + CONFIG_SCSI_3W_SAS=m + CONFIG_SCSI_AACRAID=m + CONFIG_SCSI_AIC7XXX=y + CONFIG_AIC7XXX_RESET_DELAY_MS=15000 + # CONFIG_AIC7XXX_DEBUG_ENABLE is not set + CONFIG_SCSI_AIC79XX=y + CONFIG_AIC79XX_RESET_DELAY_MS=15000 + # CONFIG_AIC79XX_DEBUG_ENABLE is not set + CONFIG_SCSI_AIC94XX=m + # CONFIG_AIC94XX_DEBUG is not set + CONFIG_SCSI_MVSAS=m + CONFIG_SCSI_DPT_I2O=m + CONFIG_SCSI_ARCMSR=m + CONFIG_MEGARAID_NEWGEN=y + CONFIG_MEGARAID_MM=y + CONFIG_MEGARAID_MAILBOX=y + CONFIG_MEGARAID_LEGACY=y + CONFIG_MEGARAID_SAS=y + CONFIG_SCSI_MPT2SAS=y + CONFIG_SCSI_BUSLOGIC=y + CONFIG_SCSI_GDTH=m + CONFIG_SCSI_QLOGIC_1280=y + CONFIG_SCSI_DH=y + CONFIG_ATA=y + CONFIG_SATA_AHCI=y + CONFIG_SATA_SIL24=y + CONFIG_ATA_PIIX=y + CONFIG_SATA_NV=y + CONFIG_SATA_PROMISE=y + CONFIG_SATA_SIL=y + CONFIG_SATA_SIS=y + CONFIG_SATA_SVW=y + CONFIG_SATA_VIA=y + CONFIG_PATA_ATIIXP=y + CONFIG_PATA_JMICRON=y + CONFIG_PATA_MPIIX=y + CONFIG_MD=y + CONFIG_BLK_DEV_MD=y + CONFIG_MD_LINEAR=y + CONFIG_MD_RAID0=y + CONFIG_MD_RAID1=y + CONFIG_MD_RAID456=y + CONFIG_MD_MULTIPATH=y + CONFIG_BLK_DEV_DM=m + CONFIG_DM_CRYPT=m + CONFIG_DM_SNAPSHOT=m + CONFIG_DM_THIN_PROVISIONING=m + CONFIG_DM_MIRROR=m + CONFIG_DM_LOG_USERSPACE=m + CONFIG_DM_RAID=m + CONFIG_DM_ZERO=m + CONFIG_DM_MULTIPATH=m + CONFIG_DM_UEVENT=y + CONFIG_TARGET_CORE=m + CONFIG_ISCSI_TARGET=m + CONFIG_FUSION=y + CONFIG_FUSION_SPI=y + CONFIG_FUSION_FC=y + CONFIG_FUSION_SAS=y + CONFIG_FUSION_CTL=y + CONFIG_NETDEVICES=y + CONFIG_BONDING=m + CONFIG_DUMMY=y + CONFIG_MACVLAN=y + CONFIG_MACVTAP=y + CONFIG_VXLAN=m + CONFIG_NETCONSOLE=m + CONFIG_NETCONSOLE_DYNAMIC=y + CONFIG_TUN=y + CONFIG_VETH=y + CONFIG_NLMON=m + CONFIG_VORTEX=y + CONFIG_TYPHOON=y + CONFIG_ACENIC=y + CONFIG_ATL1=y + CONFIG_BNX2=y + CONFIG_TIGON3=y + CONFIG_BNX2X=y + CONFIG_CHELSIO_T1=y + CONFIG_CHELSIO_T3=y + CONFIG_NET_TULIP=y + CONFIG_DE2104X=y + CONFIG_TULIP=y + CONFIG_TULIP_MMIO=y + CONFIG_TULIP_NAPI=y + CONFIG_TULIP_NAPI_HW_MITIGATION=y + CONFIG_DE4X5=y + CONFIG_DL2K=y + CONFIG_S2IO=y + CONFIG_E100=y + CONFIG_E1000=y + CONFIG_E1000E=y + CONFIG_IGB=y + CONFIG_IGBVF=y + CONFIG_IXGB=m + CONFIG_IXGBE=m + CONFIG_SKGE=y + CONFIG_SKY2=y + CONFIG_FORCEDETH=y + # CONFIG_NET_PACKET_ENGINE is not set + CONFIG_NETXEN_NIC=m + CONFIG_8139CP=y + CONFIG_8139TOO=y + CONFIG_R8169=y + CONFIG_SIS900=y + CONFIG_SIS190=y + CONFIG_VIA_RHINE=y + CONFIG_VIA_VELOCITY=y + # CONFIG_WLAN is not set + CONFIG_INPUT_POLLDEV=y + CONFIG_INPUT_EVDEV=y + # CONFIG_SERIO_SERPORT is not set + CONFIG_SERIAL_8250=y + CONFIG_SERIAL_8250_CONSOLE=y + CONFIG_PRINTER=y + CONFIG_IPMI_HANDLER=y + CONFIG_IPMI_DEVICE_INTERFACE=y + CONFIG_IPMI_SI=y + CONFIG_IPMI_WATCHDOG=y + CONFIG_IPMI_POWEROFF=y + CONFIG_HPET=y + CONFIG_I2C_AMD756=y + CONFIG_I2C_AMD756_S4882=y + CONFIG_I2C_AMD8111=y + CONFIG_I2C_ISCH=y + CONFIG_I2C_PIIX4=y + CONFIG_I2C_NFORCE2=y + CONFIG_I2C_NFORCE2_S4985=y + CONFIG_I2C_SIS5595=y + CONFIG_I2C_SIS630=y + CONFIG_I2C_SIS96X=y + CONFIG_I2C_VIA=y + CONFIG_I2C_VIAPRO=y + CONFIG_WATCHDOG=y + CONFIG_I6300ESB_WDT=y + CONFIG_ITCO_WDT=y + CONFIG_ITCO_VENDOR_SUPPORT=y + CONFIG_HP_WATCHDOG=y + CONFIG_NV_TCO=y + CONFIG_MEDIA_SUPPORT=y + CONFIG_AGP=y + CONFIG_AGP_AMD64=y + CONFIG_AGP_INTEL=m + CONFIG_DRM=y + CONFIG_DRM_AMDGPU=m + CONFIG_DRM_AMDGPU_SI=y + CONFIG_DRM_AMDGPU_CIK=y + CONFIG_DRM_AMDGPU_USERPTR=y + CONFIG_DRM_I915=m + CONFIG_FB_VESA=y + CONFIG_BACKLIGHT_CLASS_DEVICE=y + CONFIG_VGACON_SOFT_SCROLLBACK=y + CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 + CONFIG_SOUND=y + CONFIG_SND=y + CONFIG_SND_MIXER_OSS=y + CONFIG_SND_PCM_OSS=y + CONFIG_SND_DYNAMIC_MINORS=y + CONFIG_SND_CTXFI=y + CONFIG_SND_EMU10K1=y + CONFIG_SND_EMU10K1X=y + CONFIG_SND_ENS1370=y + CONFIG_SND_ENS1371=y + CONFIG_SND_ES1938=y + CONFIG_SND_ES1968=y + CONFIG_SND_INTEL8X0=y + CONFIG_SND_SONICVIBES=y + CONFIG_SND_VIA82XX=y + CONFIG_SND_VIA82XX_MODEM=y + CONFIG_SND_YMFPCI=y + CONFIG_SND_HDA_INTEL=y + CONFIG_SND_HDA_CODEC_REALTEK=y + CONFIG_SND_HDA_CODEC_ANALOG=y + CONFIG_SND_HDA_CODEC_SIGMATEL=y + CONFIG_SND_HDA_CODEC_VIA=y + CONFIG_SND_HDA_CODEC_HDMI=y + CONFIG_SND_HDA_CODEC_CIRRUS=y + CONFIG_SND_HDA_CODEC_CONEXANT=y + CONFIG_SND_HDA_CODEC_CA0110=y + CONFIG_SND_HDA_CODEC_CA0132=y + CONFIG_SND_HDA_CODEC_CMEDIA=y + CONFIG_SND_HDA_CODEC_SI3054=y + # CONFIG_SND_USB is not set + CONFIG_HIDRAW=y + CONFIG_HID_DRAGONRISE=y + CONFIG_HID_KYE=y + CONFIG_HID_GYRATION=y + CONFIG_HID_TWINHAN=y + CONFIG_HID_LOGITECH_DJ=m + CONFIG_HID_NTRIG=y + CONFIG_HID_ORTEK=y + CONFIG_HID_PANTHERLORD=y + CONFIG_HID_PETALYNX=y + CONFIG_HID_SAMSUNG=y + CONFIG_HID_SUNPLUS=y + CONFIG_HID_GREENASIA=y + CONFIG_HID_SMARTJOYPLUS=y + CONFIG_HID_TOPSEED=y + CONFIG_HID_THRUSTMASTER=y + CONFIG_HID_ZEROPLUS=y + CONFIG_USB=y + CONFIG_USB_XHCI_HCD=y + CONFIG_USB_EHCI_HCD=y + # CONFIG_USB_EHCI_TT_NEWSCHED is not set + CONFIG_USB_OHCI_HCD=y + CONFIG_USB_UHCI_HCD=y + CONFIG_USB_SL811_HCD=y + CONFIG_USB_STORAGE=y + CONFIG_USB_SERIAL=y + CONFIG_USB_SERIAL_FTDI_SIO=y + CONFIG_USB_SERIAL_OMNINET=y + CONFIG_USB_CHAOSKEY=m + CONFIG_EDAC=y + CONFIG_EDAC_MM_EDAC=y + CONFIG_EDAC_AMD64=y + CONFIG_EDAC_E752X=y + CONFIG_EDAC_I82975X=y + CONFIG_EDAC_I3000=y + CONFIG_EDAC_I3200=y + CONFIG_EDAC_IE31200=y + CONFIG_EDAC_X38=y + CONFIG_EDAC_I5400=y + CONFIG_EDAC_I7CORE=y + CONFIG_EDAC_I5000=y + CONFIG_EDAC_I5100=y + CONFIG_EDAC_I7300=y + CONFIG_EDAC_SBRIDGE=y + CONFIG_RTC_CLASS=y + # CONFIG_RTC_INTF_PROC is not set + CONFIG_AMD_IOMMU=y + CONFIG_EXT2_FS=y + CONFIG_EXT3_FS=y + CONFIG_EXT3_FS_POSIX_ACL=y + CONFIG_EXT4_FS_SECURITY=y + CONFIG_REISERFS_FS=y + CONFIG_REISERFS_PROC_INFO=y + CONFIG_REISERFS_FS_XATTR=y + CONFIG_REISERFS_FS_POSIX_ACL=y + CONFIG_JFS_FS=y + CONFIG_JFS_POSIX_ACL=y + CONFIG_JFS_STATISTICS=y + CONFIG_XFS_FS=y + CONFIG_XFS_QUOTA=y + CONFIG_XFS_POSIX_ACL=y + CONFIG_XFS_RT=y + CONFIG_BTRFS_FS=m + CONFIG_BTRFS_FS_POSIX_ACL=y + CONFIG_FANOTIFY=y + CONFIG_QUOTA=y + CONFIG_QUOTA_NETLINK_INTERFACE=y + # CONFIG_PRINT_QUOTA_WARNING is not set + CONFIG_QFMT_V2=m + CONFIG_AUTOFS4_FS=m + CONFIG_FUSE_FS=m + CONFIG_OVERLAY_FS=m + CONFIG_FSCACHE=y + CONFIG_FSCACHE_STATS=y + CONFIG_FSCACHE_HISTOGRAM=y + CONFIG_FSCACHE_DEBUG=y + CONFIG_CACHEFILES=y + CONFIG_CACHEFILES_DEBUG=y + CONFIG_CACHEFILES_HISTOGRAM=y + CONFIG_ISO9660_FS=m + CONFIG_JOLIET=y + CONFIG_ZISOFS=y + CONFIG_UDF_FS=m + CONFIG_MSDOS_FS=m + CONFIG_VFAT_FS=m + CONFIG_NTFS_FS=m + CONFIG_PROC_KCORE=y + CONFIG_TMPFS_POSIX_ACL=y + CONFIG_HUGETLBFS=y + CONFIG_ECRYPT_FS=m + CONFIG_ECRYPT_FS_MESSAGING=y + CONFIG_SQUASHFS=m + CONFIG_SQUASHFS_XATTR=y + CONFIG_SQUASHFS_LZ4=y + CONFIG_SQUASHFS_LZO=y + CONFIG_SQUASHFS_XZ=y + CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y + CONFIG_SQUASHFS_EMBEDDED=y + CONFIG_NFS_FS=m + CONFIG_NFS_V3_ACL=y + CONFIG_NFS_V4=m + CONFIG_NFS_SWAP=y + CONFIG_NFS_V4_1=y + CONFIG_NFS_FSCACHE=y + CONFIG_NFSD=m + CONFIG_NFSD_V3_ACL=y + CONFIG_NFSD_V4=y + CONFIG_CEPH_FS=m + CONFIG_CEPH_FSCACHE=y + CONFIG_CEPH_FS_POSIX_ACL=y + CONFIG_CIFS=m + CONFIG_CIFS_STATS=y + CONFIG_CIFS_XATTR=y + CONFIG_CIFS_POSIX=y + CONFIG_NLS_CODEPAGE_437=m + CONFIG_NLS_CODEPAGE_850=m + CONFIG_NLS_CODEPAGE_852=m + CONFIG_NLS_ISO8859_1=m + CONFIG_NLS_UTF8=m + CONFIG_DLM=m + CONFIG_PRINTK_TIME=y + CONFIG_DEBUG_INFO=y + CONFIG_MAGIC_SYSRQ=y + CONFIG_DEBUG_KERNEL=y + CONFIG_RCU_CPU_STALL_TIMEOUT=60 + CONFIG_FUNCTION_TRACER=y + CONFIG_FTRACE_SYSCALLS=y + CONFIG_BLK_DEV_IO_TRACE=y + CONFIG_MEMTEST=y + CONFIG_EARLY_PRINTK_DBGP=y + CONFIG_SECURITYFS=y + CONFIG_CRYPTO_GCM=m + CONFIG_CRYPTO_ECB=y + CONFIG_CRYPTO_PCBC=y + CONFIG_CRYPTO_CMAC=y + CONFIG_CRYPTO_HMAC=y + CONFIG_CRYPTO_MD4=y + CONFIG_CRYPTO_SHA1=y + CONFIG_CRYPTO_SHA256=y + CONFIG_CRYPTO_ARC4=y + CONFIG_CRYPTO_DES=y + CONFIG_KVM=m + CONFIG_KVM_INTEL=m + CONFIG_KVM_AMD=m + CONFIG_KVM_DEVICE_ASSIGNMENT=y + CONFIG_CRC_ITU_T=y + CONFIG_FONTS=y + CONFIG_FONT_8x8=y + CONFIG_FONT_8x16=y + CONFIG_FONT_7x14=y + CONFIG_FONT_PEARL_8x8=y + CONFIG_FONT_ACORN_8x8=y + CONFIG_FONT_MINI_4x6=y + CONFIG_FONT_SUN8x16=y + CONFIG_FONT_SUN12x22=y + CONFIG_FONT_10x18=y +EOF make olddefconfig - - echo "doing make -C ${S} menuconfig in ${PWD} .." - - make menuconfig } mee_build() { From edec9e0a141211f9a79b5d209fd70b0c45c948ef Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 12:06:54 +0100 Subject: [PATCH 06/10] linux-4.9.68: Build out-of-tree aacraid driver Compile the aacraid driver supplied by Adaptec, because the in-tree aacraid driver lacks support for async mode. Patch by Thomas Kreitler --- linux-4.9.68-193.bee | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index ed611abfa..3d9091717 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -29,6 +29,35 @@ same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64. && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \ && exit +# aacraid +# https://storage.microsemi.com/en-us/downloads/linux_source/linux_source_code/productid=aha-1000-8e&dn=microsemi+adaptec+hba+1000-8e.php +# http://download.adaptec.com/raid/aac/linux/aacraid-linux-src-1.2.1-55022.tgz +# http://twiki.molgen.mpg.de/foswiki/Medv/SoftwareRaid +# CONFIG_SCSI_AACRAID=m +# +build_aacraid_driver_update_and_do_depmod() { + local DRIVERBUILD=54013 + + pushd . + + echo "aacraid driver" + + mkdir -pv ${B}/aacraid_update + cd ${B}/aacraid_update + tar -xf /src/mariux/beeroot/downloads/aacraid_source_1.2.1-${DRIVERBUILD}.tgz + cd aacraid-1.2.1-${DRIVERBUILD} + chmod -x * + make -C ${B} M=${B}/aacraid_update/aacraid-1.2.1-${DRIVERBUILD} modules + + mkdir -pv ${D}/lib/modules/${FULLKERNELVERSION}/updates/drivers/scsi/aacraid + cp -v aacraid.ko ${D}/lib/modules/${FULLKERNELVERSION}/updates/drivers/scsi/aacraid + + cd ${D}/lib/modules/${FULLKERNELVERSION} + depmod -a -b ${D} ${FULLKERNELVERSION} + + popd +} + mee_patch() { echo "PATCH $@" bee_patch $@ @@ -821,6 +850,8 @@ mee_install() { make install INSTALL_PATH=${D}/boot # make firmware_install INSTALL_MOD_PATH=${D} + build_aacraid_driver_update_and_do_depmod + rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source From 136baf8e853196afbe87deb981396db30e86e7dc Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 14:38:09 +0100 Subject: [PATCH 07/10] linux-4.9.68: Add spl/zfs modules Add kernel modules required for the ZFS filesystem. http://zfsonlinux.org/ Patch by Thomas Kreitler --- linux-4.9.68-193.bee | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 3d9091717..50f5be668 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -58,6 +58,49 @@ build_aacraid_driver_update_and_do_depmod() { popd } +plaininstall_for_modules() { + local dir=$1 + local tar=$2 + local url=$3 + local xflags=$4 + ( + test -e $tar || wget $url + test -d $dir || tar xvf $tar + cd $dir + ./configure \ + --prefix=/usr \ + --with-linux=${S} \ + --with-linux-obj=${B} \ + $xflags + cd module + # depmod call fails when build as user, and would eventually mess up system dirs when run as root + sed -i -e 's/depmod/echo skipping depmod/' Makefile + make ${BEE_MAKEFLAGS} + make modules_install INSTALL_MOD_PATH=${D} + ) +} + +build_spl_zfs_extra_modules_and_do_depmod() { + pushd . + + echo "spl/zfs" + + mkdir -pv ${B}/spl_zfs_extra + cd ${B}/spl_zfs_extra + + plaininstall_for_modules spl-0.7.3 spl-0.7.3.tar.gz \ + https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/spl-0.7.3.tar.gz + + plaininstall_for_modules zfs-0.7.3 zfs-0.7.3.tar.gz \ + https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/zfs-0.7.3.tar.gz \ + "--with-spl=${B}/spl_zfs_extra/spl-0.7.3" + + cd ${D}/lib/modules/${FULLKERNELVERSION} + depmod -a -b ${D} ${FULLKERNELVERSION} + + popd +} + mee_patch() { echo "PATCH $@" bee_patch $@ @@ -851,6 +894,7 @@ mee_install() { # make firmware_install INSTALL_MOD_PATH=${D} build_aacraid_driver_update_and_do_depmod + build_spl_zfs_extra_modules_and_do_depmod rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} From bb824a41e2e820a145a233b5a63904340fbbefc2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 12:29:40 +0100 Subject: [PATCH 08/10] linux-4.9.68: Set CONFIG_SND_USB_AUDIO=m As requested by Paul. --- linux-4.9.68-193.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 50f5be668..15d95a5be 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -720,7 +720,7 @@ mee_configure() { CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y - # CONFIG_SND_USB is not set + CONFIG_SND_USB_AUDIO=m CONFIG_HIDRAW=y CONFIG_HID_DRAGONRISE=y CONFIG_HID_KYE=y From d8ffa15dd5fe4f668cd3d19f0c7a4256aab32aa5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 14:29:22 +0100 Subject: [PATCH 09/10] linux-4.9.68: Add CONFIG_DRM_NOUVEAU As requested by Thomas: * Add CONFIG_DRM_NOUVEAU=m * Change CONFIG_DRM=y to CONFIG_DRM=m When CONFIG_DRM_NOUVEAU ist set, CONFIG_FB_VESA is implied. Note, that nvidia_drm.ko requires the modules drm and drm_kms_helper. Because we select differenct nvidia modules depending on the graphics card found at boot time, we don't have that dependency in modules.dep and need to explicitly load the drm modules for nvidia. --- linux-4.9.68-193.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 15d95a5be..497732226 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -681,13 +681,13 @@ mee_configure() { CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=m - CONFIG_DRM=y + CONFIG_DRM=m CONFIG_DRM_AMDGPU=m CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_CIK=y CONFIG_DRM_AMDGPU_USERPTR=y + CONFIG_DRM_NOUVEAU=m CONFIG_DRM_I915=m - CONFIG_FB_VESA=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 From b470d34c81e15166439013ca90be12a9aeb6eb82 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 15 Dec 2017 12:10:34 +0100 Subject: [PATCH 10/10] linux-4.9.68: Add nvidia drivers --- nvidia_linux-4.9.68-193-340.102-0.bee | 90 +++++++++++++++++++++++++++ nvidia_linux-4.9.68-193-375.39-0.bee | 87 ++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100755 nvidia_linux-4.9.68-193-340.102-0.bee create mode 100755 nvidia_linux-4.9.68-193-375.39-0.bee diff --git a/nvidia_linux-4.9.68-193-340.102-0.bee b/nvidia_linux-4.9.68-193-340.102-0.bee new file mode 100755 index 000000000..bad3ecf51 --- /dev/null +++ b/nvidia_linux-4.9.68-193-340.102-0.bee @@ -0,0 +1,90 @@ +#!/bin/env beesh + +# calculate package extra versions and legacy level +# - use extraversions to define nvidia extraversion and/or legacy level +# - legacy level should be the last part of extraversion +# - legacy level 2 to 5 will be calculated from version number.. + +mxnvversion=${PKGEXTRAVERSION##*_} +: ${mxnvversion=current} + +nvextraversion="${PKGEXTRAVERSION_DASH}" + +if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then + nvextraversion="${nvextraversion%_*}" + nvextraversion="${nvextraversion#-${mxnvversion}}" +else + if [ "${PKGVERSION:0:4}" = "340." ] ; then + mxnvversion="legacy5" + elif [ "${PKGVERSION:0:4}" = "304." ] ; then + mxnvversion="legacy4" + elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then + mxnvversion="legacy3" + elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then + mxnvversion="legacy2" + else + mxnvversion="current" + fi +fi + +print_info "calculated mxnvversion = '${mxnvversion}'" +print_info "calculated nvextraversion = '${nvextraversion}'" + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run" + +SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" +PATCHURL+=('/src/mariux/patches/nvidia_340_runtimefix_for_kernel_4.9.patch') + +LINUXPKG=${PKGEXTRANAME}.${ARCH} + +LINUXKLOCALVER=$(beeversion --format "%v%-e.mx64.%r" "${LINUXPKG}") + +# '4.4.mx64.75' to '4.4.0.mx64.75' +# '4.8.6.mx64.115' to '4.8.6.mx64.115' +# '4.8-rc2.mx64.95' to '4.8.0-rc2.mx64.95' +if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(-rc[0-9]{1,2})?(\.mx64.*) ]]; then + LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}${BASH_REMATCH[3]}" +fi + + +build_in_sourcedir +sourcesubdir_append kernel + +: ${BEE_TMP_TMPDIR:=/tmp} + +mee_extract() { + LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2" + + print_info "extracting nvidia archive .." + + start_cmd rmdir ${S} + start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} + + if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source" + elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + else + print_info "extracting linux build ${LINUXPKG} .." + start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR} + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + fi + + print_info "using kernel sources from ${LINUXSRCDIR} .." +} + +mee_build_pre() { + ln -s ${LINUXSRCDIR}/include ${S}/include +} + +mee_build() { + start_cmd make SYSSRC=${LINUXSRCDIR} module +} + +mee_install() { + mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} + + cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ + + ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion} +} diff --git a/nvidia_linux-4.9.68-193-375.39-0.bee b/nvidia_linux-4.9.68-193-375.39-0.bee new file mode 100755 index 000000000..7657b8ef1 --- /dev/null +++ b/nvidia_linux-4.9.68-193-375.39-0.bee @@ -0,0 +1,87 @@ +#!/bin/env beesh + +# calculate package extra versions and legacy level +# - use extraversions to define nvidia extraversion and/or legacy level +# - legacy level should be the last part of extraversion +# - legacy level 2 to 5 will be calculated from version number.. + +mxnvversion=${PKGEXTRAVERSION##*_} +: ${mxnvversion=current} + +nvextraversion="${PKGEXTRAVERSION_DASH}" + +if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then + nvextraversion="${nvextraversion%_*}" + nvextraversion="${nvextraversion#-${mxnvversion}}" +else + if [ "${PKGVERSION:0:4}" = "340." ] ; then + mxnvversion="legacy5" + elif [ "${PKGVERSION:0:4}" = "304." ] ; then + mxnvversion="legacy4" + elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then + mxnvversion="legacy3" + elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then + mxnvversion="legacy2" + else + mxnvversion="current" + fi +fi + +print_info "calculated mxnvversion = '${mxnvversion}'" +print_info "calculated nvextraversion = '${nvextraversion}'" + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run" + +SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" + +LINUXPKG=${PKGEXTRANAME}.${ARCH} + +LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}") + +# '4.4.mx64.75' to '4.4.0.mx64.75' +if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then + LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}" +fi + + +build_in_sourcedir +sourcesubdir_append kernel + +: ${BEE_TMP_TMPDIR:=/tmp} + +mee_extract() { + LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2" + + print_info "extracting nvidia archive .." + + start_cmd rmdir ${S} + start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} + + if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source" + elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + else + print_info "extracting linux build ${LINUXPKG} .." + start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR} + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + fi + + print_info "using kernel sources from ${LINUXSRCDIR} .." +} + +mee_build_pre() { + ln -s ${LINUXSRCDIR}/include ${S}/include +} + +mee_build() { + start_cmd make SYSSRC=${LINUXSRCDIR} module +} + +mee_install() { + mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} + + cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ + + ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion} +}