From patchwork Fri Apr 12 16:57:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 42283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D47BC04FFE for ; Fri, 12 Apr 2024 16:58:46 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web10.52518.1712941114867026384 for ; Fri, 12 Apr 2024 09:58:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=L5JDhmDT; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-256628-20240412165832692558c5954f78c87b-hvcp83@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240412165832692558c5954f78c87b for ; Fri, 12 Apr 2024 18:58:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=+NvPsegLnQ93bTMs6cAIbog/DRIW3b7RTRPqb96aots=; b=L5JDhmDTbnlzsxqx4+K3/yAvxsSM2CPRYoKIibY66qYSEafUDzNiP5dDYWy31SaousDPpL FAHZEfL5gGAYElwJd10veDipzy8HAgGUlVERD/R39TN+vX/OX5UC91uNiGiaUn9sKTD43V8E AQjOBJr7+5sCOJXNvMqTYATjbRsNQ=; From: Peter Marko To: openembedded-core@lists.openembedded.org Cc: Peter Marko Subject: [OE-core][PATCH 1/3] kbd: split gpl-3 keymap to separate package Date: Fri, 12 Apr 2024 18:57:12 +0200 Message-Id: <20240412165714.8951-2-peter.marko@siemens.com> In-Reply-To: <20240412165714.8951-1-peter.marko@siemens.com> References: <20240412165714.8951-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Apr 2024 16:58:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198179 From: Peter Marko Pine keymap was added with GPL-3 license. https://github.com/legionus/kbd/commit/1589e9e1019756b5287b41dddcd7285271c5990e Split this GPL-3 keymap and install it via recommendation so it is easy to remove it by excluding recommendations. Signed-off-by: Peter Marko --- meta/recipes-core/kbd/kbd_2.6.4.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb index 790055aa96..1a7b6b552b 100644 --- a/meta/recipes-core/kbd/kbd_2.6.4.bb +++ b/meta/recipes-core/kbd/kbd_2.6.4.bb @@ -24,13 +24,16 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," -PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" +PACKAGES += "${PN}-consolefonts ${PN}-keymaps-pine ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" FILES:${PN}-consolefonts = "${datadir}/consolefonts" FILES:${PN}-consoletrans = "${datadir}/consoletrans" +FILES:${PN}-keymaps-pine = "${datadir}/keymaps/pine" FILES:${PN}-keymaps = "${datadir}/keymaps" FILES:${PN}-unimaps = "${datadir}/unimaps" +RRECOMMENDS:${PN}-keymaps = "${PN}-keymaps-pine" + do_install:append () { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then From patchwork Fri Apr 12 16:57:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 42284 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 373F7C00A94 for ; Fri, 12 Apr 2024 16:58:46 +0000 (UTC) Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net [185.136.65.228]) by mx.groups.io with SMTP id smtpd.web10.52517.1712941114833262225 for ; Fri, 12 Apr 2024 09:58:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=BWbdCA6h; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.228, mailfrom: fm-256628-202404121658326548152d2cdc4cbb7f-6hd8yt@rts-flowmailer.siemens.com) Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 202404121658326548152d2cdc4cbb7f for ; Fri, 12 Apr 2024 18:58:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=DricOFEnzNhovBfZaNVa7CLkUM0Zb/Kn91OGhIHcsAU=; b=BWbdCA6hgCrIg5yxvMpyVJ1OH3+Bn3oBQFDHtUIy1HR+yxlxyQMvSfBf9kD2wweZcYuKPQ eXb9oHNXRbDGxp/AwJ85KBncksYS32UBjObCtAnRNq7QLUw7/fVloLUgUE+pVPQPgpRPcB3C 3OAxymPLZZVrlp7933sYmmQxpTT7E=; From: Peter Marko To: openembedded-core@lists.openembedded.org Cc: Peter Marko Subject: [OE-core][PATCH 2/3] kbd: remove non-free Agafari fonts Date: Fri, 12 Apr 2024 18:57:13 +0200 Message-Id: <20240412165714.8951-3-peter.marko@siemens.com> In-Reply-To: <20240412165714.8951-1-peter.marko@siemens.com> References: <20240412165714.8951-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Apr 2024 16:58:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198181 From: Peter Marko Its license makes it impossible to distribute kbd in any commercial products. Backport commit which removes it. Signed-off-by: Peter Marko --- .../0001-Remove-non-free-Agafari-fonts.patch | 336 ++++++++++++++++++ meta/recipes-core/kbd/kbd_2.6.4.bb | 3 + 2 files changed, 339 insertions(+) create mode 100644 meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch diff --git a/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch new file mode 100644 index 0000000000..99a8fec9d8 --- /dev/null +++ b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch @@ -0,0 +1,336 @@ +From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov +Date: Thu, 29 Feb 2024 17:38:37 +0100 +Subject: [PATCH] Remove non-free Agafari fonts + +Based on legal analysis, we are removing non-free fonts for now. If we +can change the license of these fonts, we will return them back. + +From: Stanislav Brabec +Date: Wed, 28 Feb 2024 16:47:54 +0100 +Subject: kbd: Legal problems of Agafari fonts + + The data/consolefonts/README.Ethiopic contains a notice: + Agafari: + Donated by the Ethiopian Science and Technology Commission + or and may be redistributed + for non-commercial use under Unix environments only. + + According to our legal review, it makes impossible to distribute these + fonts as part of any commercial products, and even makes it impossible to + distribute kbd sources as part of any commercial product services. + + Additionally, it makes the whole kbd package incompatible with GPL, so the + COPYING file (created during build of the tarball) cannot declare GPL + version 2. It also violates section 6 of GPL (no further restrictions). + + That is why several GNU/Linux distributions exclude Agafari from the + release. To be on a safe side, SUSE even decided to repack any source + tarballs before putting it to their servers. + + This was probably reported to the former kbd maintainer about 20 years ago, + but nothing changed over years. + + That is why I recommend removing Agafari fonts and removing the reference + to them from README.Ethiopic. Alternatively, you can ask the Ethiopian + Science and Technology Commission for re-licensing. + +Signed-off-by: Alexey Gladkov + +Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee] + +Signed-off-by: Peter Marko +--- + data/consolefonts/Agafari-12.psfu | Bin 7989 -> 0 bytes + data/consolefonts/Agafari-14.psfu | Bin 9013 -> 0 bytes + data/consolefonts/Agafari-16.psfu | Bin 10037 -> 0 bytes + data/consolefonts/README.Ethiopic | 5 ----- + 4 files changed, 5 deletions(-) + delete mode 100644 data/consolefonts/Agafari-12.psfu + delete mode 100644 data/consolefonts/Agafari-14.psfu + delete mode 100644 data/consolefonts/Agafari-16.psfu + +diff --git a/data/consolefonts/Agafari-12.psfu b/data/consolefonts/Agafari-12.psfu +deleted file mode 100644 +index 3c8e796b19e676b2d9addc540e1d9507da620c02..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 7989 +zcmZvhYmgk*RmVG87>P<-D+(&r_D*IOSr`KW1`k;cFrF0(BoG{89^qkLgA|WKGS)73 +zSSDyPnmCTK{UV8+*jk)m@F{O-MdyL)u^v+q4((Ppr>h}dFTHh;vnVa=80$Hp5LHT4I?DsFN_qE+S0!sKelAe(8|oqW^MgjOZ**on^AQ8B8tCGD2&gzMa#-&)4G^wCoj#B3Fo&o$5dJ? +zM#ZEA$AMB3#!aG(j1rgm8%N22nsIA%I-MTY;J8zdM+l8yVmi{l(aB^=nT(FHv!z-$ +zB0v79-EI$Kf1`tr^F-2Bn#t3Vb4Y&q+l=EOBZW@G5u>GMU6{-#ful(vN(!0P7q<}VYOOqU_*4NN}=s`wS?ZR;jC6`o9L)osWd8;s+=O$l?^mG +z+wF6vX0qv&l9S2RP4XDMzP^C&bk{dF*1P(=8x?8$bk0uawW!x)bS0*9_3C#no;xR6 +z#zC5liLR3#@p;AFYh+@7y;i-dmJAFr +z0xoq+{ZS`ide55q)ipB~_${lghgwuaRvS(HPN^!cH#L>bCNpJ@)a^$10&Cd1OgcH= +z(D-F}=sL5c>(XStXpK%3`)Bj{Axoxi{EG~KQ;5k^TO^N+1BYPXzk;ZtTD5#BV-z7 +zCYeY*4)LanKkcWZ_%&^W_QzU#OyKwY*8b@+SFE*Pt`(X-8f)!{Pp$o&Na@y=Hc$Dz!HINsFc;Ni-A>Yb0Z_=omT{#bJG)mY1C +zWlpR8ug6;aL;KY<&#SRE@vm!tMwXFo<*d#0udT@!vc^)9L#QAUDZ9MFP-xGdf`YuU#V=8c9njyMy;-;F_}yz@t-4ymCrBKyZ_R; +z+Ux1Q8|#<;^AflIB&KW6?cYHwHrN(ui9SE3k>?YCub0WB`uu;KpP9-3pT50byPd{l +zrV3W}!zWC8Y>(DY%BRQn828CX_imYZ%Sdn8lIn?x38NpoJTtQ=ju$;Mlg4bB{z1!n +z8zuI77d9$P#oK!4DPFYrE-o_6&h&(6^TD=LJ$c>aTR%cOSg%yL2N+$FyI)&kqN+^M +z?)@xo87?9YPo(z%J8dPV8JI-b>D +z*3+)%H_sNRrro*v~l+T>4T$e;Qd +zpXixU-z0|gl{AL@oVVHU_v2@&SWi#kPW+P-sm@<+r#g52bfuC8InJ(KNr$xW)Z54M +zFb@9<|s|7sVCLWFC=reXXr;f9H2k<+Cz|IuF-}WD$MrhTIJWF1neS$_r1) +zxxgCbnJSx@>FWt$D`8aFmFSq4{b0e#?G~revM)5Ym#RDzwJRm5IgKyPX6s!Zf~7Nk +z*-us^M(Qc=6UhO4_l+_pNq(azrzC#lFK_Kcj+{ZCAoY{~zHWY#M-P1h{JTH?jaS+{ +z^Vq~UiAV0fu~Ml!$qlL9-pF%9(hDxuEV$LRG=|zzKl_#JOiAZ7h6UFh=1aCy*6SSJ +z(oOLd!ywdeix+gPOw^rJXd78Qc189G9y>=UHX-Ct95BV`={F +zZ_OF~@9~9nI-mO?U0T5&{`V=0J0Ru78g<}6mkm+J$URG9B;dfE2W;^d3R6>bPh*%1 +z)0Y6koXu}PQh%SRC&`(~Oeg26X10F+q>kyDdaT?bw%dOH;yU-c+#!+Z`H9>i5p`DN +z^qA&4jQw1XIm`Lz>C?|Yd;0VX6-zd4c5S(2+jeLqD4zwnh4mn4f +zm7Vyf_VuK856hEqL%*Zk!@-<_Q;&+3-?C4Z8W{8@o&$bR5B +z#TqBwtW?UpiWpt3&T+v@OoP|YEWmNhfm?T*nDveQg&c!htierRrajMVxk-f9`RSeG +zG}=v2iO^ItK4USN)X(^!b;jm(dyRob=E+tSp#D++&4{3gEb&}ZIyU> +zjm2=C#Cf`x3i928ywA#SEAf**)#M-PuAOMfFFMJe_{rQJ=}QH>ylD2HWZ%Gt0LF>+5R2=*j}BAWyoi9Q^&h +zT1@>s=NLah=l|yb?+e^6*Viu{;tP$rJHPP?n%?)w`-09xeEg`SI~r}C#zy|>iCF8s +zJ@L!_FFLD9Y+JMx)TSjdj&pdW6Y00BlY3bY@q0>J-f?2B>*q!5dm7coUmwc5wEUxG +znlQ)yMDtg^EifM?h=|EJ#sup;JpJ{ZK95jDL>-=GKAdE0Adbe)mhR%*KbdTm>l +zFDp4UEY<2eWM>gwU0y!Hh0rC7v%Gg#zrSnmGW2>(^q0pnSi0#!v8HBg>$TY_?GeF8 +z(dGU7CA;){{pFX`;Mmu&7u8_-aqJ1~%h)4o(0Wu29z2Hm*fPF*u@-g$dvdV+6y46K +z!2{0?9w5Vmt-*u$slkyi(D95q`e1c?LV9 +zX3jn`Xtf5dPYhc34qBfawC)?UJ~e0^8MHnI3R`)$gg_SAU@HP=BcY +zNd2+;6ZNO6qW(gr?auhk*dP#;%KH3;q<|L=_dPhVMTsVhsL!0yF9iQR{N3Oj-=VJ_xjJ{Djh_BYsP +zu+L(j!;WJ2W1q*qfIWach#kY0vA@M0!oG-o3Hv+jVeAp?@3BX*FJq5kk7G|@U%`%J +z|A3vqp2VKQzKWg1p2kjL|A;+<{S$T?dlq{RdmeiM`)BNH*o)X1>?Q2$*vsmQ3%d)u +z3%d)u3%d)u3%d)u3%3im3%3im3$F{W3$F{W3$F{W3$F{S3#SXG3#SXG3!e+03!e+0 +z3!e+03!e+03!e+03!e+03!e+03!e+03!e+03!e+03!e+03!e+03!e+03!e+03!e+0 +z3!e+02cHL@2cHL@2cHL@2cHL@2cHL@2cHL@2cHL@2cHL@2cHL@2cO4$dN6v-rw6A8 +zrw6A8r^kGH%%=yh2d@XO2d@XO2d@XO2d@XO2d@XO2d@XO2d@XO2df9C2d4+82d4+0 +z2cHL@2cHL@2cHL@51S8{50?*@50?*<&wBOY^5OE~^5ODXuRd%(Y(8v0Y(8v0Y(8v0 +zTs~YrTs~YrTs~YrTs~YrTs~YrTs~YrTs~YrTs~YrTs~YrTs~YrTs~YrTt4&Y!{#%O +zK72lWK72lWKJ(}^k3O6}oIadBoIadBoW5`}j{&R!^T_3VC4e`8H-I-_9)nL~a0hS) +za0hS)a0hS)a0hS)Fb6OPFb6OP@Uk6V3E&Oj4d4yn4d4x64PXsm4PXsm4PXsm4PXsm +z4PXsm4PXsm4PXsm4PXsm4PXsm4PXsm4PXsm4PXsm4PXsm4PXsm4PXsm4PXsn4Pgyo +z4Pgyo4Pgyo4dD#o4B-sn4B-sn4B-qvgTWdy$058Sydk_HydiTOvVKFjL%2h@LpVb? +zLpVb?LpVb?LpVb?LpVb?LpVb?LpVb?LpVb?LpVb?LpVb?LpVb?LpVb?LpVb?LpVb? +V!!zpj=TBiTVxnKdzK*@D{uc?@c;5g3 + +diff --git a/data/consolefonts/Agafari-14.psfu b/data/consolefonts/Agafari-14.psfu +deleted file mode 100644 +index fb14184855a9ae874d0bbe7f16feb4154e2f15e7..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 9013 +zcmeI1Ymgk*Re&2Uj7?=CiK2>Xdp9eQ2xB0?;3caej7LViL&E!MUX3>znPhA&c3388 +zG8#FKqJELYPHZm@#5lGiWJeZ8eh^FXl$MMOYGnOLvD(TASsJRO{GgJp3Pto|nag+1 +zz1`DFDE?E$EuEb?ea=1Se)rv@d!B#CA&;^h`4;)I$@4bzA#%Ow-&i^apFDW*)bhcO +z8aifZ%*qvGHLp3Qw5wZfrLEQWMDc62D_5@geobwDtz%3l(|Cm07mLwyWrdg&^{q8_ +z?`}vnHLWb4I<>rFZL^ziyrnf53|h{w(WvU%lAtipkql+FT#kH<#!K3hnfLzhm3xHMH=dwgbcAaQ`$#w01wJ +zHv9c%wcKy3RsPT!`aO@L-DEYwS{q*`8OT^3m#sz2m0%oH)KCBPdOaIaw40mb=FORH +zYqi>LyL6Jc-L7WCkh$1TI=V(`%?{3vqP0mx6(0J2yMMaZE*Ds)iwsGT*J6m_&(Xc&XwIEoZ)Vt7cyj?Y7YXX~r$)ZIT +zpy$o%U}h`sa--R7HJgpgYFiJaWEuKj88avpwe>Im=lH^FnI?TE#S$q4HEmn0ZS_K1 +zb|6n}aM%pk0v4F7*Xi6|XqkMRpz#B3rP)sX)U+qcWo$Ae8ta??7_TtinYmSN+m+*a7lWWB!(@8`hjzc$b9^%d +zZ?e0|8q?D5k8|7nEtNK{bFD#hmZyz_)~J0Fj9nDSPOt(}daYl~Y~-ub0QZjpM6GmdX-rLqCS{7jYs +zgaR!Cl#L$_b^tR^EQLOo;qBxra6Dj_va@_MG>eE%C6<#b8bzP;U=eNUd=@zSw5u%B +z{{Qp;P!E)3nrf*tv&u}Vvu9;uwK*R|W0_pfmRv7+CGo14zExIoZu9;5o0yU%=9HLm +zAj)-T&S(r9h1!+2H8wb+D?xCTBxeYnYm(>e6jRQ5vg9VV*N8@kayw}a{;_{~b=5^# +zUwi#uUte2Wn|Kb& +zwr|gD5@pl2?;yo@(frlb^XmcMMLP$a)zoldi81oGO?eYdMl9F1ym5=?z2Uu-yIVof +z6C$hC)4F>7e|mojt*)mn +zQ95X)Tlc)mSEsEQ&EV>>%hcU;X~@`C*#7OD%ru!UcD^`IH($h4EHYoXQ5B-(F@qo| +zL{UD@#e(O?iDEvh*{D-q?y325oA&4Uxnh*elXT?EJvAR~>2Md8n=(C^YulthbIspE +zU*}roVy~dhPET+4f?yH`+m0QDpjo}?H(e8R_8QIatjLOU)n=#bL9X4n?FQPi(kX1j+Rj|lcG53-7~V;qEVeWEq@jf<+Rogj?aVc8XQtV9dbMn}=y@w|IQe|> +zRLjOM^JMsBMmpPByT8oN&CPx7Yy6pGNoSs%#f)F($qi$US&$ng--a5q`DwK*U*>7^ +zWj32{mq)@pU*>7^Wu7)4W8@p&zNF|ZP>o?IXud3W89#NDRXp+3VPL*g^Dx+$FImuu +zCnLq2SdkbmA*13nn=jMI#K7m8Cd@TW*dMb3^Dx6J9+=1dO{2 +zBkWmB>7~I&rB?RqZjA*&P`fF=7tmp?cS;O$NKDo8e9qJ5b2i=Q@#J#dXmA1PYhT-# +z1b0#Jk}ys?!|I!8V$dTl&$syvvlW;9pIuu9Y~Qorsf}i5C~y47aZ>D+hUc0nd#B)Y +zp7ul+PqpmXE1uZq=BB50f5|;{7TB13_efCY;MFfb)_PagPM5DyDs7u&Z=U#5#UPrju}ovx&Qi~R--#11K7ZoG +zOAp}=R|JPIpN8^x+@#8+|y=|kO)&=_W7^y +z3r-uMWZJ&Fikh0F3o}n$Ik~p)u6?{1-uCtR`TD$;EDH5(zPz5~n-Or{L~YMkn>6HV +z5Y*>oN3mL?v5Sq#dbW8Ro}pthTd?=motfv_`oi37(Cdkf9wG`;iF&-OyQrdSJ`&E7 +z)Qp{MAQ^Dnp?2F*4OMjl$e8rgOezXULhY{UC3v(EMMkn^JSjg +z-N>R}BO2=)5hdCv$UVU7}?5>{;Bt{M2PR?rap615vH&qHrH7#LUkswK`|d +z1|`VMe47lKoePnzr#A?RuPw8hZK%7ks7>0bH;=rXdA-^^ht=4VmS!#6kUq;}deu9R +zWQDeD;$uzYd<3-1LUQe0WjvYOE46XeD#TQe-)}>55G1cG9`@=orO8L^4u&MUo +zHJaLn*gDp06U9Y&_OnkPIif%JlJARO+)79}|1`>@kCIKss8Daqx3f#p(frgUf8~t< +z_Cc%C(wUWOIMthjj!^cE$39Q=#3Ad@gEgZs@9WX>GXSp +zj(GB~-7NdFx6})o&m6Ee?L_x=g%g(<@$RbFIt|*WMZU^|+bg=Jtn=M+!5H4_q6~+x +z5AU6ta+<6^nR71ekYPEn;IumPKz>TV2E$kmS-Md9TFvWc_|E~~dXnp{x+iLs#`5w} +zmf}Ecp1-_%$8fk~_p(eZ=}DR?|J`G|SO2;$^rq*VYt4CHQnkoe9$2Nmu%Ox0^{cO( +zGNVU6hrDb?%TFRtA)iJbGo$X~X7unQNQ^A=>^`K697UcUEk8rGlVajPJad)K8KDVA448Q9zZ^7Mu$H&N{D#q)5>m^t&K=51!)>@-#LW9IGV$4$-LYU*Z}xy}59*=>H({FM1=^E2jW +z&Ci*iH}5dNVBTroWq#58lKExxE9O_tubE#rzhQpU{FeD`^E>8t^SkEv%FC!n|tV>n|tV>n|tW8q{R6Ic_*k>z|Tfj5CSfj40slMf?sCvYclCvYclCvYcl +zCvYb)Com^4Com`QvK?MZ;7#C7;7#C7;7wpnU`=36U`=36U`=36U`=36U`=36U`=36 +zU`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=67VNGF8VNGF8VNGF8 +z;Y{I7;Y{I7;Y{I7;Y>e*z?w3~DZDAXDZDAXDPx>6e^aysSURlpkw#-=inL{UX`yqnP`5yn7(!An*{7>|Sq5Q2HX&8xBEkx9nZVuxjd +zCZm<2Y}Btj?8NqBLyTiPLUv?ffD?UhY8+}vKKv`vJ1lT!CdVDuf+JF1k~wTnjIzkB~~%APBi +zd**@f59(Ly1M5HEySR3Bbam}wZ(f@>lr~iwqef*@iJp=|^L^j%x(0iaj>2DK-#-`( +z_Dx99dZ!=MTK#^jR_=F- +z8(lxWsWocdl-sw|YMqWt&tnF!Q_F`hchuh)n>zVD+a6H2jeE3+u0^+ycGdcj@`(EAiS9Y)kQ%*MYXrh;9*cd1`)+lHHw$eZtU*FU;>^jgXJd$im( +zULFNv6Jld0ei=FwMIQ0s!i5Xxd$xUBq(es1AmhKz4Cu&=UpIQac^bmrX}dtZt1U4$ +zo2{$HK5E{6XZz0J_NMJGs|Ueaq5g$_zxi&XOD3Jp=99^%OWoKjdN$OQdiqyB;n-f1`g>SnoAtJdzZ +zgU!|^v;C@WmQT5??J}As?i+l{Zp-BOHcPwQ$=0iPF$ko$nFN_%r_Tg%{WnRb7VdU^ +zi&Ll1BFOABH&@%z=4?KDbK<_-DeEnq_^mmKZ~K?2Su2izspM^9IZ)^qg5z%{fb}=d +z)NuXbdH*q@gI99y^Ag_e*SdW&2sw|jcd{wq+UJ(^`MG93KXiR&fUCcyT3r{snMo|B +zXuLvyNVaT$!Np7fJN}}#YPI4xX@53>vRhKivY*=ZvF56SoYbG1s=i^om6cvk?3sV5G%+m?CO>f0l*f09s`aPjiP4Su*kijkY}EJjT;HHC +zpqajLqcqQkd;H?m)Xtsb`qWgeOS}zRzegT;-v`>t%K5cGYoeb6-s#$SVUF?jw@QLs +zH{+e@o8P=y0=(&il)KwO&@;S7ugir>KhXZ8rp%Y^(*JruwfBDA{!HIL;fvYn{iT05 +zcNUodLGTLmqdjK-=MR^(-Z1x%Uazb5(k*wqLS~B5m(+NDHo}ITeod**PR-$FW_+&8 +z^mFsi`e*Y`{KabKU$r_OFN@C!F&5AAb2}KzzkXsoztK$w>7dNt=FjZ5|3}Y`$8-Lq +z*ZDJlo1gY|c|(zR7~S8QzSZ=9ru&=q_+)zZVo!K7y)rQ&Cr%LL0kwVGwy^}xf8wpz +z#IIbV``sl;==}Z4L?bBZH*9^2w0DVy7u%ofrv15Y+MnyD{kd-1zp!4-1M2wW?a%!I +z7|UDR9O+Kde +z_Tv2IhC+Ki7mr)nH2u4)n>pzGht{=2mfz}G{>Xh~4Qfztd@! +zUI3YH8<6R?0sRp>Kq27Z3i%6q=I`&f^SizJDxK-hPmZtSkCZpRnM#&FvtMW0Z*{h@ +zF}+;T>(BSG_w#t(b#Hyww~kjQ?Rd%Yc>EFe3Kw7Whi<6cFwMp%@usGN7oV2)beERK +z;%_qR&-ibBi(F~N9#Co=4m3yWveVA`mF?`&f!K{Mdu~TxNb5~`ISBMyh}g6Gb#p;( +zFY`7d0c||??S*Q@oi-_XljuW$OVeq-VOMCZ0|m1rcC`c^OGxBgjv?VshxpEuZMlWSXF +z>Syu!BD#*pStkKA{S2$WsEg4a?^*s$Z>q=yG5Wu__APTBRle8Y2v2$aKaUH~9ziPT +zqVCx!{LbIpceKA4n|toqgTJ;1h1Gy?l*&F)(f86^t6pfc+|2$}*(XNP&H8pa+ebzG +zJ^w=|PQ38ki4!jdT9w0%)7f30ymDhknoco4Nco)>oh{wDIx7|Qalosgy{;8>lP|Mx +zo!Bb=G^1`Jnt1v+YOwt5cuGzo?ht +z$#ui8^|NQ*Al|YbkKEt#vmW$e>c*eel*`;b?eNI@lEVUhM!yehf9C$=nvN&8D_!5+ +zPdb;Myex;ki^uZA!#t4w*YUVpj>RvW&)UOQ5r3V4aFa8go~XJ$mrGmU+_y{vWqw)R +z0OYy===PiYTHgM=etkv`=z}9q2(tDbT9@(3<1^v!JmQM9$LPn7%ClV89>??xto6U1 +zQnVjCdi0pqJNHq1F^}2jDMf$Gjkn8##ywJj^0lvNyVmc&M%VU%ws(#128!0DJ}Gtuy#D6zCV(DKexPNDni7xSHJQKdYTK^YOt0| +zamQC)K_}w9VwT?ziuLWQ17VH7(dF%-sEcOKf9s!}=dQjx|3&8~b6q5#=<5<}i+O6v+ +z`FEV}{K@@Jy_ws1&Beu|>;=olPIoWv+BO($+qI})7j^g3e)%UY&CiSLaL=2VX|1+q +z +zxbPWVo<&Zosnd@R=jVs>2Zr+phw~pD&L0}ie{49vFr5GRaQ^UcJ{-b1L`LAgX)LW536^oA5lN5eoR%>kE@&2wE7A4E;XaJtD5>r^=|c3s;+KP +z4YfnbKSJ +zsNYq;r*2cful_*&q532B$0|^NqHb5a)%(>Qs;Ty{zA3Yht*%IeX65AqPl9B98~{Hxpa75T{?UKIf#4|IfQ%+SwIdWArc`m +zk{~Ja3FMQ=r;tx0_aXNqpFuv0Jb*liJcKMFe}z1ZJc9f+@;AumkVlcfMIJ*wk35b% +zfjo(P0Xc&F9dZ{BKACWI1FCiz9Q^=Q* +zm(`^Z_7L_E_7L_E_7L_E_7L_E?hx(}?hx(}-Vojp-Vojp-Vojp-VoLh&JfNJ&JfNJ +zz7W0;z7W0;z7W0;z7W0;z7W0;z7W0;z7W0;z7W0;z7W0;z7W0;z7W0;z7W0;z7W0; +zz7W0;z7W0;z7W0$z6ibuz6ibuz6ibuz6ibuz6ibuz6ibuz6ibuz6ibuz6ibuzKHRR +zV2l{g2+j!32+j!3i1CaV&j{WK-U!|Z-U!|Z-U!|Z-U!|Z-U!|Z-U!|Z-U!|Z)(FlB +z&Iry3&IrB;z6ibuz6ibuz6ib;wivD$t{AQut{A46`5MC&!xh67!xb}MW7uNYV%TEX +zV%TEXV%TE1Vz^?sVz^?sVz^?sVz^?sVz^?sVz^?sVz^?sVz^?sVz^?sVz^?sVz^?s +zV#YCsEoK~J_+t2C_+t2C#xZ6bV>n|tV>n|tV>n|tW8q{R6Ic_*k>z|Tfj5CSfj40s +zlaC{CCvYclCvYclCvYclCvYb)Com^4Com`QvK?MZ;7#C7;7#C7;7wpnU`=36U`=36 +zU`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36U`=36 +zU`=67VNGF8VNGF8VNGF8;Y{I7;Y{I7;Y{I7;Y>e?z?w3~DZDAXDZDAXDPx>6e^a>e*j()bEN

or and may be redistributed +- for non-commercial use under Unix environments only. +- + Goha and GohaClassic: + Donated by Yitna Firdyiwek of GohaTibeb Associates + and may be redistributed without restriction under the GNU GPL 2.0. +-- +2.30.2 + diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb index 1a7b6b552b..3bc7d1c6b4 100644 --- a/meta/recipes-core/kbd/kbd_2.6.4.bb +++ b/meta/recipes-core/kbd/kbd_2.6.4.bb @@ -14,7 +14,10 @@ RPROVIDES:${PN} = "console-tools" RCONFLICTS:${PN} = "console-tools" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ + file://0001-Remove-non-free-Agafari-fonts.patch \ " +#required for binary patch 0001-Remove-non-free-Agafari-fonts.patch +PATCHTOOL = "git" SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926" From patchwork Fri Apr 12 16:57:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 42282 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 476D1C04FF8 for ; Fri, 12 Apr 2024 16:58:45 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web10.52519.1712941114867724372 for ; Fri, 12 Apr 2024 09:58:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=Xct4YEJE; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-2024041216583286fd02e98cb19c5c8d-lkkvzz@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2024041216583286fd02e98cb19c5c8d for ; Fri, 12 Apr 2024 18:58:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=FkekUOuGCw7bCVmALjGkKvGtEsNekIggCo0HPpAvuwk=; b=Xct4YEJERUw2iytZVNaTPkOZGNIBHL/4nOT9qEWJyR099+WfOmQuoDQ8ZSLkeSuG/ZsTdx uqBx+7djAAdFdUqihMN/9FOqjrVunyGahj4axS9LWeUDqHzPXU50SaHAYZ49a64Hi+YJ/Hyp lu+5vyGh5mraGPshiieyYr9THcjEc=; From: Peter Marko To: openembedded-core@lists.openembedded.org Cc: Peter Marko Subject: [OE-core][PATCH 3/3] kbd: update license Date: Fri, 12 Apr 2024 18:57:14 +0200 Message-Id: <20240412165714.8951-4-peter.marko@siemens.com> In-Reply-To: <20240412165714.8951-1-peter.marko@siemens.com> References: <20240412165714.8951-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 12 Apr 2024 16:58:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198180 From: Peter Marko GPL-3 is used for keymaps-pine LGPL2 is used in all C source files under src/libkfont/ which generate binaries included in main kbd package. This is seen in their SPDX headers. Signed-off-by: Peter Marko --- meta/recipes-core/kbd/kbd_2.6.4.bb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb index 3bc7d1c6b4..1295bca2a0 100644 --- a/meta/recipes-core/kbd/kbd_2.6.4.bb +++ b/meta/recipes-core/kbd/kbd_2.6.4.bb @@ -1,9 +1,19 @@ SUMMARY = "Keytable files and keyboard utilities" HOMEPAGE = "http://www.kbd-project.org/" DESCRIPTION = "The kbd project contains tools for managing Linux console (Linux console, virtual terminals, keyboard, etc.) – mainly, what they do is loading console fonts and keyboard maps." -# everything minus console-fonts is GPL-2.0-or-later -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +# consolefonts and keymaps contain also some public domain and author notice licenses +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & GPL-3.0-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://data/keymaps/pine/en.map;beginline=2;endline=15;md5=20914a59c0546a7b77ebf959bc88ad5d \ +" +LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.0-or-later" +LICENSE:${PN}-consolefonts = "GPL-2.0-or-later" +LICENSE:${PN}-consoletrans = "GPL-2.0-or-later" +LICENSE:${PN}-keymaps-pine = "GPL-3.0-or-later" +LICENSE:${PN}-keymaps = "GPL-2.0-or-later" +LICENSE:${PN}-unimaps = "GPL-2.0-or-later" inherit autotools gettext pkgconfig