Created
May 31, 2017 16:09
-
-
Save anonymous/14dfe3fb750018d03f0245ef53eb8a54 to your computer and use it in GitHub Desktop.
Arch 4.11.3 with acpi patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c | |
index 04ca8764f0c0..8bf27323f7a3 100644 | |
--- a/arch/x86/platform/efi/efi-bgrt.c | |
+++ b/arch/x86/platform/efi/efi-bgrt.c | |
@@ -36,6 +36,9 @@ void __init efi_bgrt_init(struct acpi_table_header *table) | |
if (acpi_disabled) | |
return; | |
+ if (!efi_enabled(EFI_BOOT)) | |
+ return; | |
+ | |
if (table->length < sizeof(bgrt_tab)) { | |
pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n", | |
table->length, sizeof(bgrt_tab)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# $Id$ | |
# Maintainer: Tobias Powalowski <tpowa@archlinux.org> | |
# Maintainer: Thomas Baechler <thomas@archlinux.org> | |
#pkgbase=linux # Build stock -ARCH kernel | |
pkgbase=linux-custom # Build kernel with a different name | |
_srcname=linux-4.11 | |
pkgver=4.11.3 | |
pkgrel=1 | |
arch=('i686' 'x86_64') | |
url="https://www.kernel.org/" | |
license=('GPL2') | |
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf') | |
options=('!strip') | |
source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" | |
"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign" | |
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" | |
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign" | |
"acpi.patch" | |
# the main kernel config files | |
'config.i686' 'config.x86_64' | |
# pacman hook for initramfs regeneration | |
'90-linux.hook' | |
# standard config files for mkinitcpio ramdisk | |
'linux.preset') | |
sha256sums=('b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6' | |
'SKIP' | |
'5847b5d2a3252cd19a28ed1dc13a238d041396792c7863e9ff0bbf5b79cd5e90' | |
'SKIP' | |
'101fb305cdedcdc1d4d85fd27d66b3acbf97ea71eb490e892753d671635ad184' | |
'e4e928488d35ba2b4049bd224dee87be9eb574ed3c1882f22c8fd5d8674c9abd' | |
'2e38528bd2f1be712f5a274b66882c41d2a9cf996b3a05b4a772c8ba7309b261' | |
'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' | |
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') | |
validpgpkeys=( | |
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds | |
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman | |
) | |
_kernelname=${pkgbase#linux} | |
prepare() { | |
cd "${srcdir}/${_srcname}" | |
# add upstream patch | |
patch -p1 -i "${srcdir}/patch-${pkgver}" | |
patch -p1 -i "${srcdir}/acpi.patch" | |
# add latest fixes from stable queue, if needed | |
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git | |
cat "${srcdir}/config.${CARCH}" > ./.config | |
if [ "${_kernelname}" != "" ]; then | |
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config | |
sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config | |
fi | |
# set extraversion to pkgrel | |
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile | |
# don't run depmod on 'make install'. We'll do this ourselves in packaging | |
sed -i '2iexit 0' scripts/depmod.sh | |
# get kernel version | |
make prepare | |
# load configuration | |
# Configure the kernel. Replace the line below with one of your choice. | |
#make menuconfig # CLI menu for configuration | |
#make nconfig # new CLI menu for configuration | |
#make xconfig # X-based configuration | |
#make oldconfig # using old config from previous kernel version | |
# ... or manually edit .config | |
# rewrite configuration | |
yes "" | make config >/dev/null | |
} | |
build() { | |
cd "${srcdir}/${_srcname}" | |
make ${MAKEFLAGS} LOCALVERSION= bzImage modules | |
} | |
_package() { | |
pkgdesc="The ${pkgbase/linux/Linux} kernel and modules" | |
[ "${pkgbase}" = "linux" ] && groups=('base') | |
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') | |
optdepends=('crda: to set the correct wireless channels of your country') | |
backup=("etc/mkinitcpio.d/${pkgbase}.preset") | |
install=linux.install | |
cd "${srcdir}/${_srcname}" | |
KARCH=x86 | |
# get kernel version | |
_kernver="$(make LOCALVERSION= kernelrelease)" | |
_basekernel=${_kernver%%-*} | |
_basekernel=${_basekernel%.*} | |
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} | |
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install | |
cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" | |
# set correct depmod command for install | |
sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \ | |
"${startdir}/${install}" > "${startdir}/${install}.pkg" | |
true && install=${install}.pkg | |
# install mkinitcpio preset file for kernel | |
sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" | | |
install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" | |
# install pacman hook for initramfs regeneration | |
sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/90-linux.hook" | | |
install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook" | |
# remove build and source links | |
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} | |
# remove the firmware | |
rm -rf "${pkgdir}/lib/firmware" | |
# make room for external modules | |
ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" | |
# add real version for building modules and running depmod from post_install/upgrade | |
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" | |
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" | |
# Now we call depmod... | |
depmod -b "${pkgdir}" -F System.map "${_kernver}" | |
# move module tree /lib -> /usr/lib | |
mkdir -p "${pkgdir}/usr" | |
mv "${pkgdir}/lib" "${pkgdir}/usr/" | |
# add vmlinux | |
install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" | |
} | |
_package-headers() { | |
pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" | |
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" | |
cd "${srcdir}/${_srcname}" | |
install -D -m644 Makefile \ | |
"${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile" | |
install -D -m644 kernel/Makefile \ | |
"${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile" | |
install -D -m644 .config \ | |
"${pkgdir}/usr/lib/modules/${_kernver}/build/.config" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include" | |
for i in acpi asm-generic config crypto drm generated keys linux math-emu \ | |
media net pcmcia scsi soc sound trace uapi video xen; do | |
cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/" | |
done | |
# copy arch includes for external modules | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86" | |
cp -a arch/x86/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86/" | |
# copy files necessary for later builds, like nvidia and vmware | |
cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build" | |
cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build" | |
# fix permissions on scripts dir | |
chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel" | |
cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" | |
if [ "${CARCH}" = "i686" ]; then | |
cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" | |
fi | |
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/" | |
# add docbook makefile | |
install -D -m644 Documentation/DocBook/Makefile \ | |
"${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" | |
# add dm headers | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md" | |
cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md" | |
# add inotify.h | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux" | |
cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/" | |
# add wireless headers | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/" | |
cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/" | |
# add dvb headers for external modules | |
# in reference to: | |
# http://bugs.archlinux.org/task/9912 | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core" | |
cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/" | |
# and... | |
# http://bugs.archlinux.org/task/11194 | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/" | |
cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/" | |
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new | |
# in reference to: | |
# http://bugs.archlinux.org/task/13146 | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" | |
cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" | |
cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" | |
# add dvb headers | |
# in reference to: | |
# http://bugs.archlinux.org/task/20402 | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb" | |
cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends" | |
cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners" | |
cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/" | |
# add xfs and shmem for aufs building | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm" | |
# removed in 3.17 series | |
# cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h" | |
# copy in Kconfig files | |
for i in $(find . -name "Kconfig*"); do | |
mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'` | |
cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}" | |
done | |
# add objtool for external module building and enabled VALIDATION_STACK option | |
if [ -f tools/objtool/objtool ]; then | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool" | |
cp -a tools/objtool/objtool ${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool/ | |
fi | |
chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build" | |
find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \; | |
# strip scripts directory | |
find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do | |
case "$(file -bi "${binary}")" in | |
*application/x-sharedlib*) # Libraries (.so) | |
/usr/bin/strip ${STRIP_SHARED} "${binary}";; | |
*application/x-archive*) # Libraries (.a) | |
/usr/bin/strip ${STRIP_STATIC} "${binary}";; | |
*application/x-executable*) # Binaries | |
/usr/bin/strip ${STRIP_BINARIES} "${binary}";; | |
esac | |
done | |
# remove unneeded architectures | |
rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} | |
# remove a files already in linux-docs package | |
rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-01" | |
rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-02" | |
rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.select-break" | |
} | |
_package-docs() { | |
pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" | |
cd "${srcdir}/${_srcname}" | |
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build" | |
cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build" | |
find "${pkgdir}" -type f -exec chmod 444 {} \; | |
find "${pkgdir}" -type d -exec chmod 755 {} \; | |
# remove a file already in linux package | |
rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" | |
} | |
pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") | |
for _p in ${pkgname[@]}; do | |
eval "package_${_p}() { | |
$(declare -f "_package${_p#${pkgbase}}") | |
_package${_p#${pkgbase}} | |
}" | |
done | |
# vim:set ts=8 sts=2 sw=2 et: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment