diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2021-04-23 11:56:27 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2021-04-23 11:56:27 +0200 |
| commit | b1c1ff69a04f735cbfa5d3dadc1109ef9091e2a1 (patch) | |
| tree | 66d56c803bb82a51c4e95da8226170f3e9e5ca70 /extra | |
| parent | 5c3104477a1d5a1d9b57f6a5b9030591a7bcfea1 (diff) | |
| parent | e1b297c1114bea3acb0ee925b67459a1848d1cdb (diff) | |
| download | packages-b1c1ff69a04f735cbfa5d3dadc1109ef9091e2a1.tar.xz | |
Merge branch 'master' of ssh://git.archlinux32.org/packages
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/linux-olpc-xo1/PKGBUILD | 4 | ||||
| -rw-r--r-- | extra/linux-zen/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/linux-zen/config | 11 |
3 files changed, 11 insertions, 10 deletions
diff --git a/extra/linux-olpc-xo1/PKGBUILD b/extra/linux-olpc-xo1/PKGBUILD index d8cd5fe6..624b88af 100644 --- a/extra/linux-olpc-xo1/PKGBUILD +++ b/extra/linux-olpc-xo1/PKGBUILD @@ -2,7 +2,7 @@ MODEL=olpc-xo1 pkgbase=linux-${MODEL} -pkgver='5.11.15.arch1' +pkgver='5.11.16.arch1' pkgrel='1' pkgdesc='Linux for OLPC XO-1' _srctag=v${pkgver%.*}-${pkgver##*.} @@ -25,7 +25,7 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman 'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig) ) -sha256sums=('9f76328675e11edf9257623d884b50a181952746cb44304b9ec4ee8bac941456' +sha256sums=('932dfd2a780f1b3a95f4e35b87c6afaca6a403cbbe6b69cfc6d92d10d79832bf' '18730a94777487843be91aff97ca7553e6a666219c810fc570a920f877877c1d') export KBUILD_BUILD_HOST=archlinux diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index bd4b5831..f0e2b755 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -1,9 +1,9 @@ -# upstream git revision: 4731f889136837b1ca4041742082337ed3dd532a +# upstream git revision: ae43e5ee1a7eb2773c5578943aff8f4722bd7ba5 # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '796949e1c074444b2a70514458da4e8e651807e47050f860ae629d22284f98c9' ]; then - sha256sums[${i}]='82ba2664517002cf12ec01c124234e624b7ac5afd5b29d2922eb736b729aa85f' + if [ "${sha256sums[${i}]}" = '275b93c1ee3c557a919586868351c02c801072fb1c67ab029ba044fca9dd75a8' ]; then + sha256sums[${i}]='57db04a166e800acfb636b59953d697cff7503af4f74e86e91b8e53ca59ece22' fi done diff --git a/extra/linux-zen/config b/extra/linux-zen/config index 66d5af25..483a3c46 100644 --- a/extra/linux-zen/config +++ b/extra/linux-zen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.11.15-zen1 Kernel Configuration +# Linux/x86 5.11.16-zen1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -2281,7 +2281,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_RAM is not set +CONFIG_MTD_RAM=m # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set # end of RAM/ROM/Flash chip drivers @@ -2290,8 +2290,9 @@ CONFIG_MTD_CFI_I2=y # Mapping drivers for chip access # # CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_PLATRAM is not set +CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access # @@ -6508,7 +6509,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_VGA16 is not set -# CONFIG_FB_UVESA is not set +CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set @@ -7374,7 +7375,7 @@ CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m -# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_ALPS=m CONFIG_HID_MCP2221=m # end of Special HID drivers |