From patchwork Thu May 23 07:58:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44074 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 922C8C41513 for ; Thu, 23 May 2024 07:58:29 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web10.10243.1716451102332625934 for ; Thu, 23 May 2024 00:58:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Wnz6qVd/; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.43, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-41fd5dc0480so48991145e9.1 for ; Thu, 23 May 2024 00:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716451100; x=1717055900; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=uRU2gbYkkJsSrrsD3T8BO/HDtFci2lxiIXQGmVAujwA=; b=Wnz6qVd/c37G75BCVQop0N9Dgbuq6LFKOxdVO/hZLM+XrDN9dk14PAG78oz4hNa5mc KND/+op2DEQJmktXzSdoCAM7lU5BsNO/QqbDfYOMlD6KKwHwcjJXdowvbYhKQdhGF6FM QmuxpFWy1YNfa8KysGSgMAgL+ZNMYQGLMZ4Vo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716451100; x=1717055900; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uRU2gbYkkJsSrrsD3T8BO/HDtFci2lxiIXQGmVAujwA=; b=RC7Caz51X9U4lQebrjvbi9e17n67HCtXbI6wBkKJDTAOF+5Tgp9fPqq4bAfcD1wUYU +wWC9SDlTR5kP+d/QMT0j2x9YeHmJEexiQ4aSITSnIf0NSmcDCzT2pwfoHqCW8yhJfWU B8ubP6crFZBrLdlIpAJrZOs8WcfVEEGIX02fXSajl7CbOf6BIEzEIMh2AowucxsWTH3H z186WgI4mhu4rzgE/5n2xzMh6XVfXchywHyS4AU+kIyAVCHd5b+REcJcy7BTJWt3JGDx F5QlQke7cvwZoyfrV7vIdUJm4eqH7yAzseXaECDph0YHV1KbgAo4DDol3UneOK6liSJH uOlQ== X-Gm-Message-State: AOJu0YwQAhnmNMDiZ4wdfZPtRQlI6xyM/Bhk+aVX8pOKQTe7o9PiWJYU QJ2/hLGV1u3+VMbtGuFP5efIrd/5LvQUs5FASyWYWhSHNpQBTp/aKDO/XyUi8TDVfV3M1iYRjtk X X-Google-Smtp-Source: AGHT+IFSC4nOPJ2/H145QfFhmmVly2RRwZHEs4x9LpsgOZanNraN24lidpWZK39jM8KR+4zPzQGyCQ== X-Received: by 2002:a1c:4b15:0:b0:41b:dabe:8633 with SMTP id 5b1f17b1804b1-420fd30edfemr31308815e9.21.1716451099962; Thu, 23 May 2024 00:58:19 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:bf06:e9d5:d26:9301]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f75acesm17120265e9.27.2024.05.23.00.58.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 00:58:19 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/5] usbinit: Drop recipe Date: Thu, 23 May 2024 08:58:14 +0100 Message-Id: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 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 ; Thu, 23 May 2024 07:58:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199779 This recipe is poorly named, it is a gadget ethernet driver. Gadget ethernet is of questionable use now and usbinit isn't referenced/used anywhere within OE-Core. Drop it. Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-bsp/usbinit/usbinit.bb | 26 -- meta/recipes-bsp/usbinit/usbinit/COPYING.GPL | 339 ------------------- meta/recipes-bsp/usbinit/usbinit/usb-gether | 23 -- 4 files changed, 389 deletions(-) delete mode 100644 meta/recipes-bsp/usbinit/usbinit.bb delete mode 100644 meta/recipes-bsp/usbinit/usbinit/COPYING.GPL delete mode 100755 meta/recipes-bsp/usbinit/usbinit/usb-gether diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8470a580e33..1cb2f708faa 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -830,7 +830,6 @@ RECIPE_MAINTAINER:pn-unifdef = "Ross Burton " RECIPE_MAINTAINER:pn-uninative-tarball = "Richard Purdie " RECIPE_MAINTAINER:pn-unzip = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-update-rc.d = "Ross Burton " -RECIPE_MAINTAINER:pn-usbinit = "Alexander Kanavin " RECIPE_MAINTAINER:pn-usbutils = "Alexander Kanavin " RECIPE_MAINTAINER:pn-util-linux = "Chen Qi " RECIPE_MAINTAINER:pn-util-linux-libuuid = "Chen Qi " diff --git a/meta/recipes-bsp/usbinit/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb deleted file mode 100644 index 091aa73bb52..00000000000 --- a/meta/recipes-bsp/usbinit/usbinit.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Initscript for enabling USB gadget Ethernet" -DESCRIPTION = "This module allows ethernet emulation over USB, allowing for \ -all sorts of nifty things like SSH and NFS in one go plus charging over the \ -same wire, at higher speeds than most Wifi connections." -HOMEPAGE = "http://linux-sunxi.org/USB_Gadget/Ethernet" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" - - -SRC_URI = "file://usb-gether \ - file://COPYING.GPL" - -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" - -do_install() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/init.d - install usb-gether ${D}${sysconfdir}/init.d -} - -inherit update-rc.d allarch - -INITSCRIPT_NAME = "usb-gether" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." diff --git a/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL b/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL deleted file mode 100644 index d511905c164..00000000000 --- a/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/meta/recipes-bsp/usbinit/usbinit/usb-gether b/meta/recipes-bsp/usbinit/usbinit/usb-gether deleted file mode 100755 index e80a0bb30ea..00000000000 --- a/meta/recipes-bsp/usbinit/usbinit/usb-gether +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh -# -# usb-ether Start up the gadget usb ethernet interface. -# - -case "$1" in - start|"") - test "$VERBOSE" != no && echo "Initializing g_ether gadget..." - modprobe g_ether - ifup usb0 - ;; - stop) - test "$VERBOSE" != no && echo "Disabling g_ether..." - ifdown usb0 - rmmod g_ether - ;; - *) - echo "Usage: usb-ether {start|stop}" >&2 - exit 1 - ;; -esac - -exit 0 From patchwork Thu May 23 07:58:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44077 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 DC66FC25B7E for ; Thu, 23 May 2024 07:58:29 +0000 (UTC) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by mx.groups.io with SMTP id smtpd.web10.10244.1716451102793714187 for ; Thu, 23 May 2024 00:58:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=EfZ086OJ; spf=pass (domain: linuxfoundation.org, ip: 209.85.208.170, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2e73359b979so37048411fa.1 for ; Thu, 23 May 2024 00:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716451101; x=1717055901; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8vDOkAKNM/iL2Ky8X0exm1aiRzzzUvaypMItnvbde+w=; b=EfZ086OJNsNDrFbVtbLn/3Iah1QacxgJYCbRGGcyznhfPOEP0t+FWq2SAOp+OjmbJ8 jUufce3aXtqo0+mLoIJUEiuN/xtGh/bJhKPjFY210z8Rc34zPtKsiSnPSAidHGDOkyot 6VDe5Wqd7laBhASoY9LcgzKp97IsgCR2m9rcA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716451101; x=1717055901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8vDOkAKNM/iL2Ky8X0exm1aiRzzzUvaypMItnvbde+w=; b=IWtXp6N67AGdWE+FloUfCc2TYEeRnv033SA/7tpVA7GO+Djj1Odcv03MbL+pQGdcDn JCdlhDLFKLRQLgQhUbAnPasOPbhulg2EOSlTfqfAJ/9fl3allWLYplu3ninccG8s0zru rHtSjqc+yGgvpojN0eXf/akZtkke/jQJCQ/CVvQnzeR++iTDnvPu6ZCtnOhlbLTbMjVi p90b2vlzb5nJLoJhG+yi/O9dN7MU43wguYPtERi2q1YT2nWdWOf6II89aeA8hoHBtBdr Btn8LlbXEt4Pr0R6HWB11M6+dGQYXn4GcggzETvsCcpvS0RKpeLyk48kssJEmmqnPO20 2NEQ== X-Gm-Message-State: AOJu0YxBT/wACuUibIDKcIqUCj5lcDQnxyrsB9CpQPP4U/4pp384//J0 6BDRClqPxZkUePnU28kBGofUZBgAOgSQLublAviopvhSBAGeZ++gi0DAiC6CuoraN7apAAVyNzE T X-Google-Smtp-Source: AGHT+IHRCvhL0GLq4eadMkbgirBUsNX8xVnIIzOVZOm2mP6Ed1afONt3VRVNv1apz36jrOPL8iOMsQ== X-Received: by 2002:a2e:8388:0:b0:2da:736d:3cf5 with SMTP id 38308e7fff4ca-2e9495afd88mr25571581fa.41.1716451100669; Thu, 23 May 2024 00:58:20 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:bf06:e9d5:d26:9301]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f75acesm17120265e9.27.2024.05.23.00.58.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 00:58:20 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/5] insane: Add error for B = WORKDIR Date: Thu, 23 May 2024 08:58:15 +0100 Message-Id: <20240523075818.2307756-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> References: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 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 ; Thu, 23 May 2024 07:58:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199780 This was never a good idea and would have mostly happened from S = WORKDIR however explictly disallow it and error if anyone tries. Signed-off-by: Richard Purdie --- meta/classes-global/insane.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index eeef43d00e2..42ed1a24a74 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1603,9 +1603,12 @@ python () { oe.qa.handle_error("uppercase-pn", 'PN: %s is upper case, this can result in unexpected behavior.' % pn, d) sourcedir = d.getVar("S") + builddir = d.getVar("B") workdir = d.getVar("WORKDIR") if sourcedir == workdir: bb.fatal("Using S = ${WORKDIR} is no longer supported") + if builddir == workdir: + bb.fatal("Using B = ${WORKDIR} is no longer supported") # Some people mistakenly use DEPENDS:${PN} instead of DEPENDS and wonder # why it doesn't work. From patchwork Thu May 23 07:58:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44073 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 92E63C25B75 for ; Thu, 23 May 2024 07:58:29 +0000 (UTC) Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by mx.groups.io with SMTP id smtpd.web10.10246.1716451103182456157 for ; Thu, 23 May 2024 00:58:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=WUka9RCO; spf=pass (domain: linuxfoundation.org, ip: 209.85.208.171, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2e576057c56so69403421fa.3 for ; Thu, 23 May 2024 00:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716451101; x=1717055901; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jec7pWwC/C/Kb50kvZ0uQxl+7OdV4/Qfk5k7OTUxsEk=; b=WUka9RCO9vce94Kn8/jIWx3cuTT3Wp3JNHOqjBmCsmjzRHYyZeX+4P8TXscmBz0+ds QQKgalxPZQiwTJv3JWZy+UWZQJAKLPPLMGC0ZJptpW01lPvKGEN9E6DqOIuSDzCkV/Fq L8YPpr2NLnUsNXCvfqanlvlvnl3YYDCVy9vv0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716451101; x=1717055901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jec7pWwC/C/Kb50kvZ0uQxl+7OdV4/Qfk5k7OTUxsEk=; b=PM5rbHlQ/ORA3D4ek7ASpO+UwaSKczX9Hg5+dlw6xY9Z1VTZArgyr16854MSeSyrvB Qy+dw9se75MJdOHXwOtZqL/BkcaD4/e/1sibJIlCvop9rRdmGxzVLzSHs6y5QD50N0fq Rp1kM+NrlyrB1B6qB9stFrsQwew4/Tz4DPoNuK+ImVt6meXUgfQ4FTeMmUji3Z62fs9p TN575+lDSy+XAfsu+ZWmZwdD23E9UO0g8NpSsCmucfismJt1ToVXlmx4tRvINGRP2hOj Tvi/uOH49CfI3Hr3iLghFtCVrlPL6DqudmBIvdKe7Sp3GGNZxG+k4BBzpOOK/Vcu3Qxs 6UCw== X-Gm-Message-State: AOJu0Yy6e7Q13dQHrvExETMPGdvhYHF53KHhGiL0Wwo8YgPsuF+PLebm HRk0I0jY3c093ZxZzrZPhHpCqhn9JFQ+tRRL8EQLkJwLvySHS2lWdml7/BZ3HEdsXesi/bmuM53 4 X-Google-Smtp-Source: AGHT+IE1/MKaLGov67W6oK8cKbDBi13biUGobsEK5qnU7mMYSnfgO34/GxxjAexMlCNIT0IUAjNg+A== X-Received: by 2002:a2e:9c94:0:b0:2e1:ec20:9ae5 with SMTP id 38308e7fff4ca-2e9495d40e5mr22080651fa.31.1716451101279; Thu, 23 May 2024 00:58:21 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:bf06:e9d5:d26:9301]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f75acesm17120265e9.27.2024.05.23.00.58.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 00:58:21 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/5] base/bitbake.conf: Move S/B to PSEUDO_IGNORE_PATHS unconditionally Date: Thu, 23 May 2024 08:58:16 +0100 Message-Id: <20240523075818.2307756-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> References: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 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 ; Thu, 23 May 2024 07:58:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199781 Now S and B can't be set to WORKDIR, add to PSEUDO_IGNORE_PATHS unconditionally and simplify the code. Signed-off-by: Richard Purdie --- meta/classes-global/base.bbclass | 5 ----- meta/conf/bitbake.conf | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 13e91b24a3b..4ac7bafefab 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -433,11 +433,6 @@ python () { if d.getVar("B")[-1] == '/': bb.warn("Recipe %s sets B variable with trailing slash '%s', remove it" % (d.getVar("PN"), d.getVar("B"))) - if os.path.normpath(d.getVar("WORKDIR")) != os.path.normpath(d.getVar("S")): - d.appendVar("PSEUDO_IGNORE_PATHS", ",${S}") - if os.path.normpath(d.getVar("WORKDIR")) != os.path.normpath(d.getVar("B")): - d.appendVar("PSEUDO_IGNORE_PATHS", ",${B}") - # To add a recipe to the skip list , set: # SKIP_RECIPE[pn] = "message" pn = d.getVar('PN') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 75c850760f6..3ef2deb088b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -752,7 +752,7 @@ PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native" PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,/run/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR}" PSEUDO_IGNORE_PATHS .= ",${TMPDIR}/sstate-control,${TMPDIR}/buildstats,${TMPDIR}/sysroots-components,${TMPDIR}/pkgdata" PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/deploy-,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/pkgdata-sysroot" -PSEUDO_IGNORE_PATHS .= ",${DEPLOY_DIR},${BUILDHISTORY_DIR},${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR}" +PSEUDO_IGNORE_PATHS .= ",${DEPLOY_DIR},${BUILDHISTORY_DIR},${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR},${S},${B}" export PSEUDO_DISABLED = "1" #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" From patchwork Thu May 23 07:58:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44076 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 916D8C25B79 for ; Thu, 23 May 2024 07:58:29 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.11653.1716451103841424657 for ; Thu, 23 May 2024 00:58:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=XE8youH3; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.47, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4202cea9a2fso16186505e9.3 for ; Thu, 23 May 2024 00:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716451102; x=1717055902; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qQYoFHzNJLQDlSqWTWhxfWd7fQsElP/pK5hX+sUwtIA=; b=XE8youH3cwB2JGhNOH59QO6y4wQKhmjzMchWcmrxliY5o18JK39ltwESqvfKnCkbHG xN5fcQ4Flw4B3z93te9P5a6voAOSzDmPuKWmgbwWQ4z3euRXDDBfw2h8bv8HFhIvwHiZ 0hUUqtedEjPtwWWX6s+mI3IUo7xuKgUt9EJo0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716451102; x=1717055902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qQYoFHzNJLQDlSqWTWhxfWd7fQsElP/pK5hX+sUwtIA=; b=nPkqjiUHzoXTvkNVtzu+T4uXb91dfbg4tM3kdxtaIQ0AY+P7e4llCmebr4506tKGfH PAZQDpAy5ihkmRt4l9CTez7nHuS5qUksUxbCklf5QhlgK/79XwMfErqsF1N+yNMzbS/8 RxwlihVNfZud5oges648sP6uN5Y7vqFqTzVvdE/p6Dxw0k+rjbZ4q0/t6HY17Fk4DT4P KTBjp4hRWhWDd7dVOdyfaHM/9qHNHNV+cTqAQPLUHOjkbKqZ+h8jweSCnFGoN3e6rvUF ncAZG4savXhWInnJ2v1OV3i5auavcj1ghtMqP8f3A3LNxNFmmHwA5bva764QmY2w8emo 4Yaw== X-Gm-Message-State: AOJu0YyYzAxWgIY3Nc2gWpkVYlo52SNVVnGwYLJWbuyDZuxU8kmUqkbh Tlf92j5Hmy9opdqBFh9FPGSRTFpnqS9Hxzvv/pTyB/aDyn/xc7afUNd1AffbFslBuqkKwtfKN9J 0 X-Google-Smtp-Source: AGHT+IH+wv8GT11HrFmnmoTQv3oEHiT0BG8DliZcf978ydpOLGyHt8WIEWb5Qa2RdSFrKe+QrCq3ng== X-Received: by 2002:a1c:4b10:0:b0:41f:a9ac:1023 with SMTP id 5b1f17b1804b1-420fd30ee4fmr28873715e9.17.1716451102078; Thu, 23 May 2024 00:58:22 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:bf06:e9d5:d26:9301]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f75acesm17120265e9.27.2024.05.23.00.58.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 00:58:21 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/5] base/insane: Move S/B checks to more logical place in insane class Date: Thu, 23 May 2024 08:58:17 +0100 Message-Id: <20240523075818.2307756-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> References: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 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 ; Thu, 23 May 2024 07:58:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199782 Signed-off-by: Richard Purdie --- meta/classes-global/base.bbclass | 5 ----- meta/classes-global/insane.bbclass | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 4ac7bafefab..b6940bbb6ff 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -428,11 +428,6 @@ python () { oe.utils.features_backfill("DISTRO_FEATURES", d) oe.utils.features_backfill("MACHINE_FEATURES", d) - if d.getVar("S")[-1] == '/': - bb.warn("Recipe %s sets S variable with trailing slash '%s', remove it" % (d.getVar("PN"), d.getVar("S"))) - if d.getVar("B")[-1] == '/': - bb.warn("Recipe %s sets B variable with trailing slash '%s', remove it" % (d.getVar("PN"), d.getVar("B"))) - # To add a recipe to the skip list , set: # SKIP_RECIPE[pn] = "message" pn = d.getVar('PN') diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 42ed1a24a74..99736830b9a 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1609,6 +1609,10 @@ python () { bb.fatal("Using S = ${WORKDIR} is no longer supported") if builddir == workdir: bb.fatal("Using B = ${WORKDIR} is no longer supported") + if sourcedir[-1] == '/': + bb.warn("Recipe %s sets S variable with trailing slash '%s', remove it" % (d.getVar("PN"), d.getVar("S"))) + if builddir[-1] == '/': + bb.warn("Recipe %s sets B variable with trailing slash '%s', remove it" % (d.getVar("PN"), d.getVar("B"))) # Some people mistakenly use DEPENDS:${PN} instead of DEPENDS and wonder # why it doesn't work. From patchwork Thu May 23 07:58:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44075 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 AD792C25B7A for ; Thu, 23 May 2024 07:58:29 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web10.10247.1716451104848964010 for ; Thu, 23 May 2024 00:58:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=gIo6Z9YN; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.46, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4202cea9941so50025535e9.1 for ; Thu, 23 May 2024 00:58:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716451103; x=1717055903; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TBpk3jvpVJwgOlMUz2uTwpJM+GUSDZqVFCss6VFG5hk=; b=gIo6Z9YNzCYYwpAJLy+eCzwQ9NRIRMkSAHbiuEgf+YdMD5JvxiuXJncV6ShLUI1q4D K+esFYL9ZrsB10PKJ4Mevubo4XJqHK1KME5fUKEQmPcKe0uVRaiY5V1+KK3+evxb/WSx T28lpeJoR6Z9dYywKPhAbwEkUvkqeCOTXjk8M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716451103; x=1717055903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TBpk3jvpVJwgOlMUz2uTwpJM+GUSDZqVFCss6VFG5hk=; b=h8GPxfh+z7zHAEJmkiQjMfNsJUZVfv51tuHAiiZqjKOPkXy4Cx6261q/psnOSUls// HqyaV4EaX6c/+qIZjQoc6ixoApdqs1MsyQV49RwsCKJ7b7cgZvNo62hai3v4HNgoFPvC 7qFsQjKxC0Ge5DI4ipyQpB3p9E9MqPes7LClqeONjUSr535lhJnoh36wwrVd+og5lqMf 9YUmcY/Gs0Gncul1c+XH2Lpx/wiI4PpWkcrScoIyL9HTHAX4K6QyQbmaA9q03V7GuO0l 0q+ou5Jldkfqqph6PeRl4i0C9JQ00sPaZ4DRM/NYFq/kx8GfTXrejSSljqP63jjdciYc csVw== X-Gm-Message-State: AOJu0YzrAvLnScTMZYFatAkEjsfWv4dJlgvuMMkIooUOKJv2Xr0Vwho3 9jR5bcQ5mscX/PlOgj8vklScAgEJc4KSbZgFXspAfsJt7cRWmbvlxRASbPCFfXWO9VqG+J3TktG V X-Google-Smtp-Source: AGHT+IHeUH6+yp3TGbMTctsdAjzVufnaqZiUbSwcdbv7DpoUMYYycIkx2Gw3Z/cAcISiMDAchEOq0Q== X-Received: by 2002:a7b:c38a:0:b0:41e:454b:2f7 with SMTP id 5b1f17b1804b1-420fd31fe36mr35943645e9.23.1716451103019; Thu, 23 May 2024 00:58:23 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:bf06:e9d5:d26:9301]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f75acesm17120265e9.27.2024.05.23.00.58.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 00:58:22 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/5] useradd-example: Fix S = WORKDIR reference Date: Thu, 23 May 2024 08:58:18 +0100 Message-Id: <20240523075818.2307756-5-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> References: <20240523075818.2307756-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 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 ; Thu, 23 May 2024 07:58:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199783 Update not to use S = WORKDIR after that was no longer allowed. Signed-off-by: Richard Purdie --- meta-skeleton/recipes-skeleton/useradd/useradd-example.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb index 8437a5a7745..b0d96e7f711 100644 --- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb @@ -9,7 +9,8 @@ SRC_URI = "file://file1 \ file://file3 \ file://file4" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" PACKAGES =+ "${PN}-user3"