diff options
author | shmilee | 2020-10-13 15:55:32 +0800 |
---|---|---|
committer | shmilee | 2020-10-13 15:55:32 +0800 |
commit | 05b2876c2c7040871060755316a4939a3c290aa3 (patch) | |
tree | 953a871c1ca6b1503f19df2296bd1342d60e922f | |
parent | efb5d1a41273ef35c80984ce603c322b5efb8fbb (diff) | |
download | aur-05b2876c2c7040871060755316a4939a3c290aa3.tar.gz |
test: LTS 5.4.66
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | linux-cjktty-patch-for-5.4.66+.patch | 193 |
3 files changed, 203 insertions, 5 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-shmilee - pkgver = 5.4.64 + pkgver = 5.4.66 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -14,7 +14,7 @@ pkgbase = linux-shmilee options = !strip source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.64.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.66.xz source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz source = https://raw.githubusercontent.com/dolohow/uksm/150e27c4e7f66e4519c89573305eca8c42091f4d/v5.x/uksm-5.4.patch source = linux-cjktty-5.4.patch::https://github.com/torvalds/linux/compare/v5.4...Gentoo-zh:5.4-utf8.patch @@ -26,6 +26,7 @@ pkgbase = linux-shmilee source = linux-cjktty-patch-for-5.4.36+.patch source = linux-cjktty-patch-for-5.4.54+.patch source = linux-cjktty-patch-for-5.4.62+.patch + source = linux-cjktty-patch-for-5.4.66+.patch source = config source = 60-linux.hook source = 90-linux.hook @@ -34,7 +35,7 @@ pkgbase = linux-shmilee validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491 sha256sums = SKIP - sha256sums = 01ceb94f15a8e1877cc10b85179f2f1e6fafdede793c53e8a0b75771e9769a53 + sha256sums = fd9444a5b5b5f10cbe1dc2d236f6fc3552a807905d4bb44cf4806ebadf90697d sha256sums = f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c sha256sums = 81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e sha256sums = 50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a @@ -46,6 +47,7 @@ pkgbase = linux-shmilee sha256sums = 573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2 sha256sums = 2c9faabb5e09b1f818b051ced3eb90b6c04aa08616952d99eedf328c7c8dda2f sha256sums = 4d511fb62966549b9ea4a1d97769f79e4d66fc141cd0b001e7d286367a038a09 + sha256sums = 1f0af2c1044cf177b84fea8bb49aaa5cf9282c5588a7995798d63177565b0727 sha256sums = 7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 @@ -8,7 +8,7 @@ # https://www.kernel.org/category/releases.html # 5.4 Greg Kroah-Hartman & Sasha Levin 2019-11-24 Dec, 2021 _LLL_VER=5.4 -_LLL_SUBVER=64 +_LLL_SUBVER=66 # Bisect debug, v5.4.47 -> v5.4.48 _Bisect_debug=off # on, test, off @@ -78,6 +78,7 @@ source=( 'linux-cjktty-patch-for-5.4.36+.patch' 'linux-cjktty-patch-for-5.4.54+.patch' 'linux-cjktty-patch-for-5.4.62+.patch' + 'linux-cjktty-patch-for-5.4.66+.patch' 'config' # the main kernel config file '60-linux.hook' # pacman hook for depmod '90-linux.hook' # pacman hook for initramfs regeneration @@ -90,7 +91,7 @@ validpgpkeys=( # https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' 'SKIP' - '01ceb94f15a8e1877cc10b85179f2f1e6fafdede793c53e8a0b75771e9769a53' + 'fd9444a5b5b5f10cbe1dc2d236f6fc3552a807905d4bb44cf4806ebadf90697d' 'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c' '81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e' '50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a' @@ -102,6 +103,7 @@ sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' '573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2' '2c9faabb5e09b1f818b051ced3eb90b6c04aa08616952d99eedf328c7c8dda2f' '4d511fb62966549b9ea4a1d97769f79e4d66fc141cd0b001e7d286367a038a09' + '1f0af2c1044cf177b84fea8bb49aaa5cf9282c5588a7995798d63177565b0727' '7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' @@ -156,6 +158,7 @@ prepare() { patch -i ../linux-cjktty-patch-for-5.4.36+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch" patch -i ../linux-cjktty-patch-for-5.4.54+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch" patch -i ../linux-cjktty-patch-for-5.4.62+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch" + patch -i ../linux-cjktty-patch-for-5.4.66+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch" patch -Np1 -i "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch" msg "Patching sphinx extensions for htmldocs" diff --git a/linux-cjktty-patch-for-5.4.66+.patch b/linux-cjktty-patch-for-5.4.66+.patch new file mode 100644 index 000000000000..dbceeeae02cb --- /dev/null +++ b/linux-cjktty-patch-for-5.4.66+.patch @@ -0,0 +1,193 @@ +--- linux-cjktty-5.4.65.patch 2020-09-18 00:19:07.610052000 +0800 ++++ linux-cjktty-5.4.66.patch 2020-09-18 19:03:23.870884705 +0800 +@@ -284,7 +284,7 @@ + #include <linux/module.h> + #include <linux/slab.h> + #include <linux/string.h> +-@@ -43,6 +44,21 @@ static void update_attr(u8 *dst, u8 *src, int attribute, ++@@ -43,6 +44,19 @@ static void update_attr(u8 *dst, u8 *src, int attribute, + } + } + +@@ -293,8 +293,6 @@ + + unsigned long p = (long)utf8; + + if (p >= vc->vc_origin && p < vc->vc_scr_end) { + + return scr_readw((unsigned short *)(p + vc->vc_screenbuf_size)); +-+ } else if (vc->vc_num == fg_console && fbcon_is_softback(utf8)){ +-+ return scr_readw((unsigned short *)(p + fbcon_softback_size)); + + } else { + + u16 extra_c; + + int c = *(int*)utf8; +@@ -381,7 +379,7 @@ + + + cursor.set = 0; + +- if (softback_lines) { ++ c = scr_readw((u16 *) vc->vc_pos); + @@ -258,7 +299,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, + + c = scr_readw((u16 *) vc->vc_pos); +@@ -395,43 +393,7 @@ + index c9235a2f42f89..7ed69f292db9b 100644 + --- a/drivers/video/fbdev/core/fbcon.c + +++ b/drivers/video/fbdev/core/fbcon.c +-@@ -123,7 +123,8 @@ static int logo_lines; +- enums. */ +- static int logo_shown = FBCON_LOGO_CANSHOW; +- /* Software scrollback */ +--static int fbcon_softback_size = 32768; +-+/*I need to use it out side fbcon.c */ +-+int fbcon_softback_size = 32768; +- static unsigned long softback_buf, softback_curr; +- static unsigned long softback_in; +- static unsigned long softback_top, softback_end; +-@@ -216,6 +217,14 @@ static void fbcon_start(void); +- static void fbcon_exit(void); +- static struct device *fbcon_device; +- +-+int fbcon_is_softback(const unsigned short *str) +-+{ +-+ unsigned long p = (long)str; +-+ if(p >= softback_buf && p <softback_end) +-+ return 1; +-+ return 0; +-+} +-+ +- #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION +- static inline void fbcon_set_rotation(struct fb_info *info) +- { +-@@ -1019,10 +1028,7 @@ static const char *fbcon_startup(void) +- if (info->fix.type != FB_TYPE_TEXT) { +- if (fbcon_softback_size) { +- if (!softback_buf) { +-- softback_buf = +-- (unsigned long) +-- kvmalloc(fbcon_softback_size, +-- GFP_KERNEL); +-+ softback_buf = (unsigned long) kmalloc(fbcon_softback_size * 2, GFP_KERNEL); +- if (!softback_buf) { +- fbcon_softback_size = 0; +- softback_top = 0; ++ + @@ -1051,7 +1057,8 @@ static const char *fbcon_startup(void) + vc->vc_font.width = font->width; + vc->vc_font.height = font->height; +@@ -481,31 +443,6 @@ + p->userfont = t->userfont; + if (p->userfont) + REFCOUNT(p->fontdata)++; +-@@ -1612,6 +1618,7 @@ static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count) +- static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p, +- long delta) +- { +-+ u16 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; +- int count = vc->vc_rows; +- unsigned short *d, *s; +- unsigned long n; +-@@ -1674,6 +1681,8 @@ static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p, +- start = s; +- } +- } +-+ if( ((scr_readw(s) & charmask) == 0xff || (scr_readw(s) & charmask) == 0xfe) && scr_readw(s + (vc->vc_screenbuf_size >> 1)) != 0){ +-+ }else{ +- if (c == scr_readw(d)) { +- if (s > start) { +- fbcon_putcs(vc, start, s - start, +-@@ -1685,6 +1694,7 @@ static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p, +- start++; +- } +- } +-+ } +- s++; +- d++; +- } while (s < le); + @@ -1767,6 +1777,7 @@ static void fbcon_redraw_blit(struct vc_data *vc, struct fb_info *info, + } + +@@ -554,14 +491,6 @@ + console_conditional_schedule(); + s++; + d++; +-@@ -1852,6 +1868,7 @@ static inline void fbcon_softback_note(struct vc_data *vc, int t, +- +- while (count) { +- scr_memcpyw((u16 *) softback_in, p, vc->vc_size_row); +-+ scr_memcpyw((u16 *) softback_in + (fbcon_softback_size >> 1), p + (vc->vc_screenbuf_size >> 1), vc->vc_size_row); +- count--; +- p = advance_row(p, 1); +- softback_in += vc->vc_size_row; + @@ -2455,7 +2472,6 @@ static int fbcon_get_font(struct vc_data *vc, struct console_font *font) + + font->width = vc->vc_font.width; +@@ -570,40 +499,22 @@ + if (!font->data) + return 0; + +-@@ -2760,6 +2776,19 @@ static u16 *fbcon_screen_pos(struct vc_data *vc, int offset) +- unsigned long p; +- int line; +- ++@@ -2593,6 +2593,10 @@ static void fbcon_set_palette(struct vc_ ++ ++ static u16 *fbcon_screen_pos(struct vc_data *vc, int offset) ++ { + + if (offset < 0) { + + offset = -offset - 1; +-+ if (vc->vc_num != fg_console || !softback_lines) +-+ return (u16 *)(vc->vc_origin + offset + (vc->vc_screenbuf_size)); +-+ line = offset / vc->vc_size_row; +-+ if (line >= softback_lines) +-+ return (u16 *) (vc->vc_origin + offset - softback_lines * vc->vc_size_row + (vc->vc_screenbuf_size)); +-+ p = softback_curr + offset; +-+ if (p >= softback_end) +-+ p += softback_buf - softback_end; +-+ return (u16 *) (p + (fbcon_softback_size)); +-+ } +-+ +- if (vc->vc_num != fg_console || !softback_lines) +- return (u16 *) (vc->vc_origin + offset); +- line = offset / vc->vc_size_row; +-@@ -2867,6 +2896,8 @@ static void fbcon_scrolldelta(struct vc_data *vc, int lines) +- q -= vc->vc_size_row; +- scr_memcpyw((u16 *) q, (u16 *) p, +- vc->vc_size_row); +-+ scr_memcpyw((u16 *) (q + (vc->vc_screenbuf_size >> 1)), (u16 *) (p + (fbcon_softback_size >> 1)), +-+ vc->vc_size_row); +- } +- softback_in = softback_curr = p; +- update_region(vc, vc->vc_origin, +++ return (u16 *)(vc->vc_origin + offset + (vc->vc_screenbuf_size)); +++ } ++ return (u16 *) (vc->vc_origin + offset); ++ } ++ + diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h + index 20dea853765f5..b34c419dd1eb2 100644 + --- a/drivers/video/fbdev/core/fbcon.h + +++ b/drivers/video/fbdev/core/fbcon.h +-@@ -262,4 +262,13 @@ extern void fbcon_set_rotate(struct fbcon_ops *ops); ++@@ -262,4 +262,10 @@ extern void fbcon_set_rotate(struct fbcon_ops *ops); + #define fbcon_set_rotate(x) do {} while(0) + #endif /* CONFIG_FRAMEBUFFER_CONSOLE_ROTATION */ + +@@ -613,9 +524,6 @@ + +#define fbcon_platform_get_rotate(i) FB_ROTATE_UR + +#endif /* CONFIG_DMI */ + + +-+extern int fbcon_softback_size; +-+extern int fbcon_is_softback(const unsigned short *str); +-+ + #endif /* _VIDEO_FBCON_H */ + diff --git a/drivers/video/fbdev/core/fbcon_ccw.c b/drivers/video/fbdev/core/fbcon_ccw.c + index dfa9a8aa4509c..beb33f5795061 100644 +@@ -665,8 +573,8 @@ + if (!ops->fontbuffer) + return; + @@ -245,9 +258,19 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode, +- y += softback_lines; +- } ++ ++ cursor.set = 0; + + - c = scr_readw((u16 *) vc->vc_pos); + + c = scr_readw((u16 *) vc->vc_pos); |