diff options
author | Yurii Kolesnykov | 2019-09-12 07:59:12 +0300 |
---|---|---|
committer | Yurii Kolesnykov | 2019-09-12 07:59:12 +0300 |
commit | 94dee7e4578c7f79299517e7d46c2247a6b1c36f (patch) | |
tree | d3bf2a6ac8df0ad807ed51c9ccbd1a0903b00bab | |
parent | ce4f331796ebb2618fba6bcc2ffb7a52d95236ac (diff) | |
download | aur-94dee7e4578c7f79299517e7d46c2247a6b1c36f.tar.gz |
rebase onto linux-mainline
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | 90-linux.hook | 9 | ||||
-rw-r--r-- | PKGBUILD | 41 | ||||
-rw-r--r-- | config | 21 | ||||
-rw-r--r-- | linux.preset | 33 |
5 files changed, 47 insertions, 70 deletions
@@ -1,7 +1,7 @@ pkgbase = linux-amd-wip-git pkgdesc = Linux kernel with AMDGPU DC patches pkgver = 5.3.843232.7a83645ac0cc - pkgrel = 1 + pkgrel = 2 url = https://cgit.freedesktop.org/~agd5f/linux/ arch = x86_64 license = GPL2 @@ -11,6 +11,11 @@ pkgbase = linux-amd-wip-git makedepends = bc makedepends = libelf makedepends = git + makedepends = python-sphinx + makedepends = python-sphinx_rtd_theme + makedepends = graphviz + makedepends = imagemagick + makedepends = git options = !strip source = linux-amd-wip-git::git://people.freedesktop.org/~agd5f/linux#branch=drm-next-5.4-wip source = config @@ -18,10 +23,10 @@ pkgbase = linux-amd-wip-git source = 90-linux.hook source = linux.preset sha256sums = SKIP - sha256sums = 04c517b92f84c1c2bde2a73b63584449642a9e0d8b3074d3d9ade2ca779c476a - sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 + sha256sums = c405c700b2cb06c4ec805b7e327d0b66416395995519281194a8293da69b398a sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 - sha256sums = 997dd1ca5c59e526a35d8367e6371a68406b1a58b90006e6f85d59a580c7503f + sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0 + sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 pkgname = linux-amd-wip-git pkgdesc = The Linux-amd-wip-git kernel and modules diff --git a/90-linux.hook b/90-linux.hook index b33873c854fb..9851151995bc 100644 --- a/90-linux.hook +++ b/90-linux.hook @@ -2,11 +2,10 @@ Type = File Operation = Install Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* +Target = boot/vmlinuz-%PKGBASE% +Target = usr/lib/initcpio/* [Action] -Description = Updating %PKGBASE% module dependencies... +Description = Updating %PKGBASE% initcpios When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% +Exec = /usr/bin/mkinitcpio -p %PKGBASE% @@ -13,11 +13,14 @@ _kernel_rel=5.4 _branch=drm-next-${_kernel_rel}-wip _kernelname=${pkgbase#linux} pkgver=5.3.843232.7a83645ac0cc -pkgrel=1 +pkgrel=2 arch=(x86_64) url='https://cgit.freedesktop.org/~agd5f/linux/' license=(GPL2) -makedepends=(xmlto kmod inetutils bc libelf git) +makedepends=( + xmlto kmod inetutils bc libelf git python-sphinx python-sphinx_rtd_theme + graphviz imagemagick git +) options=('!strip') source=("${pkgbase}::git://people.freedesktop.org/~agd5f/linux#branch=${_branch}" config # the main kernel config file @@ -26,10 +29,10 @@ source=("${pkgbase}::git://people.freedesktop.org/~agd5f/linux#branch=${_branch} linux.preset # standard config files for mkinitcpio ramdisk ) sha256sums=('SKIP' - '04c517b92f84c1c2bde2a73b63584449642a9e0d8b3074d3d9ade2ca779c476a' - 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' + 'c405c700b2cb06c4ec805b7e327d0b66416395995519281194a8293da69b398a' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - '997dd1ca5c59e526a35d8367e6371a68406b1a58b90006e6f85d59a580c7503f') + '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' + 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') pkgver() { cd "${_srcname}" local version="$(grep \^VERSION Makefile|cut -d"=" -f2|cut -d" " -f2)" @@ -69,9 +72,7 @@ prepare() { build() { cd $_srcname -#mainline: disabled for 5.1-rc5 -#make bzImage modules htmldocs - make bzImage modules + make bzImage modules htmldocs } _package() { @@ -222,19 +223,17 @@ _package-docs() { mkdir -p "$builddir" cp -t "$builddir" -a Documentation - #mainline: disabled for 5.1-rc5 - - #msg2 "Removing doctrees..." - #rm -r "$builddir/Documentation/output/.doctrees" - - #msg2 "Moving HTML docs..." - #local src dst - #while read -rd '' src; do - #dst="$builddir/Documentation/${src#$builddir/Documentation/output/}" - #mkdir -p "${dst%/*}" - #mv "$src" "$dst" - #rmdir -p --ignore-fail-on-non-empty "${src%/*}" - #done < <(find "$builddir/Documentation/output" -type f -print0) + msg2 "Removing doctrees..." + rm -r "$builddir/Documentation/output/.doctrees" + + msg2 "Moving HTML docs..." + local src dst + while read -rd '' src; do + dst="$builddir/Documentation/${src#$builddir/Documentation/output/}" + mkdir -p "${dst%/*}" + mv "$src" "$dst" + rmdir -p --ignore-fail-on-non-empty "${src%/*}" + done < <(find "$builddir/Documentation/output" -type f -print0) msg2 "Adding symlink..." mkdir -p "$pkgdir/usr/share/doc" @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.2.0-rc5 Kernel Configuration +# Linux/x86 5.2.2-arch1 Kernel Configuration # # @@ -176,6 +176,7 @@ CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y +CONFIG_USER_NS_UNPRIVILEGED=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_CHECKPOINT_RESTORE=y @@ -1016,7 +1017,6 @@ CONFIG_ARCH_HAS_PKEYS=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y -CONFIG_AS_DIRTY_HELPERS=y # end of Memory Management options CONFIG_NET=y @@ -3318,7 +3318,7 @@ CONFIG_LED_TRIGGER_PHY=y CONFIG_SFP=m CONFIG_AMD_PHY=m CONFIG_AQUANTIA_PHY=m -# CONFIG_ASIX_PHY is not set +CONFIG_AX88796B_PHY=m CONFIG_AT803X_PHY=m CONFIG_BCM7XXX_PHY=m CONFIG_BCM87XX_PHY=m @@ -6175,7 +6175,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DP_CEC=y CONFIG_DRM_TTM=m -CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y @@ -6215,8 +6214,7 @@ CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN1_0=y -CONFIG_DRM_AMD_DC_DCN2_0=y -CONFIG_DRM_AMD_DC_DSC_SUPPORT=y +CONFIG_DRM_AMD_DC_DCN1_01=y # CONFIG_DEBUG_KERNEL_DC is not set # end of Display Engine Configuration @@ -6230,7 +6228,6 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU_SVM=y CONFIG_DRM_I915=m CONFIG_DRM_I915_ALPHA_SUPPORT=y -CONFIG_DRM_I915_FORCE_PROBE="*" CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y @@ -6242,7 +6239,6 @@ CONFIG_DRM_I915_GVT_KVMGT=m # # CONFIG_DRM_I915_WERROR is not set # CONFIG_DRM_I915_DEBUG is not set -# CONFIG_DRM_I915_DEBUG_MMIO is not set # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set # CONFIG_DRM_I915_DEBUG_GUC is not set @@ -6252,13 +6248,6 @@ CONFIG_DRM_I915_GVT_KVMGT=m # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set # end of drm/i915 Debugging -# -# drm/i915 Profile Guided Optimisation -# -CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 -CONFIG_DRM_I915_SPIN_REQUEST=5 -# end of drm/i915 Profile Guided Optimisation - CONFIG_DRM_VGEM=m CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX=m @@ -6293,7 +6282,6 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m CONFIG_DRM_PANEL_LG_LG4573=m CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m -# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_PANEL_RAYDIUM_RM68200=m @@ -6302,7 +6290,6 @@ CONFIG_DRM_PANEL_RONBO_RB070D30=m CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m -# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m CONFIG_DRM_PANEL_SEIKO_43WVF1G=m CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m diff --git a/linux.preset b/linux.preset index 046277584140..66709a8c1537 100644 --- a/linux.preset +++ b/linux.preset @@ -1,27 +1,14 @@ -post_install () { - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod %KERNVER% -} +# mkinitcpio preset file for the '%PKGBASE%' package -post_upgrade() { - if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then - echo "WARNING: /boot appears to be a separate partition but is not mounted." - fi +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-%PKGBASE%" - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod %KERNVER% +PRESETS=('default' 'fallback') - if [ $(vercmp $2 3.13) -lt 0 ]; then - echo ">>> WARNING: AT keyboard support is no longer built into the kernel." - echo ">>> In order to use your keyboard during early init, you MUST" - echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." - fi -} +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-%PKGBASE%.img" +#default_options="" -post_remove() { - # also remove the compat symlinks - rm -f boot/initramfs-%PKGBASE%.img - rm -f boot/initramfs-%PKGBASE%-fallback.img -} +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-%PKGBASE%-fallback.img" +fallback_options="-S autodetect" |