Changeset f596dde

Timestamp:

04/24/2019 04:16:20 PM (5 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

2c603d8

Parents:

7fa9369

Message:

Get rid of the GPLv2 license:

• Replace the menu system with the Kconfiglib, which has an ISC license
• Remove farce and any reference to it
• Rewrite the copyright notice, add the LICENSE files
• Adapt Config.in and a few other programs to the new menu system

Files:

• BLFS/Makefile (modified) (2 diffs)
• BLFS/xsl/gen_config.xsl (modified) (3 diffs)
• Config.in (modified) (36 diffs)
• FUNCTION_LIST (modified) (2 diffs)
• LICENSE (modified) (1 diff)
• Makefile (modified) (2 diffs)
• README (modified) (1 diff)
• common/libs/func_compare.sh (modified) (3 diffs)
• common/libs/func_install_blfs (modified) (1 diff)
• common/libs/func_validate_configs.sh (modified) (2 diffs)
• extras/farce (deleted)
• extras/filelist (deleted)
• install-blfs-tools.sh (modified) (1 diff)
• jhalfs (modified) (3 diffs)
• menu/BusyBox-1.1.3-menu.patch (deleted)
• menu/Kconfig-language.txt (deleted)
• menu/LICENSE.txt (added)
• menu/Makefile (deleted)
• menu/README (added)
• menu/conf.c (deleted)
• menu/confdata.c (deleted)
• menu/expr.c (deleted)
• menu/expr.h (deleted)
• menu/kconfiglib.py (added)
• menu/lex.zconf.c_shipped (deleted)
• menu/lkc.h (deleted)
• menu/lkc_proto.h (deleted)
• menu/lxdialog/BIG.FAT.WARNING (deleted)
• menu/lxdialog/checklist.c (deleted)
• menu/lxdialog/colors.h (deleted)
• menu/lxdialog/dialog.h (deleted)
• menu/lxdialog/inputbox.c (deleted)
• menu/lxdialog/menubox.c (deleted)
• menu/lxdialog/msgbox.c (deleted)
• menu/lxdialog/textbox.c (deleted)
• menu/lxdialog/util.c (deleted)
• menu/lxdialog/yesno.c (deleted)
• menu/mconf.c (deleted)
• menu/menu.c (deleted)
• menu/menuconfig.py (added)
• menu/symbol.c (deleted)
• menu/util.c (deleted)
• menu/zconf.l (deleted)
• menu/zconf.tab.c_shipped (deleted)
• menu/zconf.tab.h_shipped (deleted)
• menu/zconf.y (deleted)

BLFS/Makefile

@@ -101 +101 @@
         $(Q)$(TOPDIR)/gen_pkg_book.sh $(TOPDIR) $(BLFS_FULL) $(LFS_FULL)
 
-$(CONFIG_OUT): $(CONFIG_CONFIG_IN) $(MENU)/mconf
-        $(Q)$(MENU)/mconf $(CONFIG_CONFIG_IN)
-
-$(MENU)/mconf:
-        $(Q)$(MAKE) -C $(MENU) ncurses conf mconf
+$(CONFIG_OUT): $(CONFIG_CONFIG_IN)
+        $(Q)CONFIG_="" KCONFIG_CONFIG=configuration \
+            $(MENU)/menuconfig.py $(CONFIG_CONFIG_IN)
 
 $(CONFIG_CONFIG_IN): $(PACK_LIST) $(XSLDIR)/gen_config.xsl
@@ -203 +201 @@
         rm -f $(CONFIG_OUT) $(CONFIG_OUT).old $(TOPDIR)/packages.xml $(XSLDIR)/specialCases.xsl $(CONFIG_CONFIG_IN) book.xml
         rm -rf $(TOPDIR)/dependencies $(TOPDIR)/book-html $(TOPDIR)/scripts
-        - $(MAKE) -C $(MENU) clean
 
 FORCE:

BLFS/xsl/gen_config.xsl

@@ -113 +113 @@
       <xsl:value-of select="name"/>
       <xsl:text>"
-depends MENU_</xsl:text>
+depends on MENU_</xsl:text>
       <xsl:value-of select="@id"/>
       <xsl:text>
@@ -141 +141 @@
       <xsl:value-of select="name"/>
       <xsl:text>"
-&#9;depends MENU_</xsl:text>
+&#9;depends on MENU_</xsl:text>
       <xsl:value-of select="@id"/>
       <xsl:text>
@@ -188 +188 @@
       <xsl:value-of select="name"/>
       <xsl:text>"
-&#9;&#9;depends MENU_</xsl:text>
+&#9;&#9;depends on MENU_</xsl:text>
       <xsl:value-of select="translate(name,' ()','___')"/>
       <xsl:text>

Config.in

@@ -42 +42 @@
 
     choice
-    depends BOOK_BLFS
+    depends on BOOK_BLFS
     prompt "Init system"
 
@@ -108 +108 @@
         string    "Branch (preceded by \"branch-\"), stable Version, or tag"
         default    "**EDIT ME**"
-        depends    BRANCH
+        depends on    BRANCH
         help
             A list of valid branches and stable book IDs is available at
@@ -119 +119 @@
         string    "Loc of working copy (mandatory)"
         default    "**EDIT ME**"
-        depends    WORKING_COPY
+        depends on    WORKING_COPY
         help
             The full path to a local copy of the book XML sources
@@ -129 +129 @@
         prompt    "Target architecture"
         default    ARCH_X86
-        depends    BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
+        depends on    BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
         help
             Choose the target system base architecture
@@ -157 +157 @@
     choice
         prompt    "Hardware Platform"
-        depends    BOOK_CLFS3 && ARCH_MIPS
+        depends on    BOOK_CLFS3 && ARCH_MIPS
         default    PLATFORM_GENERIC
         help
@@ -172 +172 @@
     choice
         prompt    "Library"
-        depends    (BOOK_CLFS && !ARCH_ALPHA) || (BOOK_CLFS3 && ARCH_MIPS)
+        depends on    (BOOK_CLFS && !ARCH_ALPHA) || (BOOK_CLFS3 && ARCH_MIPS)
         default    DATA_32
         help
@@ -189 +189 @@
     choice
         prompt    "Processor type"
-        depends    (BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3) && ((ARCH_X86 && !(DATA_64 || DATA_MULTI)) || ARCH_MIPS || ARCH_HPPA || ARCH_ALPHA || (ARCH_SPARC && (DATA_64 || DATA_MULTI)) || (ARCH_ARM && BOOK_CLFS3))
+        depends on    (BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3) && ((ARCH_X86 && !(DATA_64 || DATA_MULTI)) || ARCH_MIPS || ARCH_HPPA || ARCH_ALPHA || (ARCH_SPARC && (DATA_64 || DATA_MULTI)) || (ARCH_ARM && BOOK_CLFS3))
         help
             Choose the target system processor
@@ -259 +259 @@
     choice
         prompt    "MIPS 64 ABI"
-        depends    BOOK_CLFS3 && ARCH_MIPS && DATA_64
+        depends on    BOOK_CLFS3 && ARCH_MIPS && DATA_64
         default    ABI_64
         help
@@ -323 +323 @@
     config TARGET32
         string
-        depends    DATA_MULTI
+        depends on    DATA_MULTI
         default "i686-pc-linux-gnu"        if ARCH_X86
         default "mipsel-unknown-linux-gnu" if PROC_mipsel
@@ -369 +369 @@
     config  MIPS_LEVEL
         string
-        depends BOOK_CLFS3 && ARCH_MIPS
+        depends on BOOK_CLFS3 && ARCH_MIPS
         default "1"        if DATA_32
         default "3"        if DATA_64
@@ -375 +375 @@
     config    ABI
         string
-        depends BOOK_CLFS3
+        depends on BOOK_CLFS3
         default "-m32"      if ARCH_X86 || ARCH_ARM
 #        default "-m64"     if NO USED YET IN THE BOOK
@@ -384 +384 @@
     config    ENDIAN
         string
-        depends BOOK_CLFS3 && (ARCH_MIPS || ARCH_ARM)
+        depends on BOOK_CLFS3 && (ARCH_MIPS || ARCH_ARM)
         default "little"    if PROC_mipsel || PROC_ARM || PROC_ARM5L
         default "big"       if PROC_mips || PROC_ARM5B
@@ -390 +390 @@
     choice
         prompt    "Build method"
-        depends    BOOK_CLFS
+        depends on    BOOK_CLFS
         help
             What build method should be used: a chroot jail or minimal boot
@@ -542 +542 @@
         string "BLFS sources directory (internal parameter)"
         default "blfs-xml"
-        depends BLFS_TOOL || BOOK_BLFS
+        depends on BLFS_TOOL || BOOK_BLFS
         help
             The directory name under $BLFS_ROOT where the BLFS
@@ -551 +551 @@
         string "LFS sources directory (internal parameter)"
         default "lfs-xml"
-        depends BLFS_TOOL || BOOK_BLFS
+        depends on BLFS_TOOL || BOOK_BLFS
         help
             The directory name under $BLFS_ROOT where the LFS
@@ -559 +559 @@
         choice
         prompt    "LFS Release"
-        default    LFS_SVN
-        depends    BOOK_BLFS
+        default    LFS_relSVN
+        depends on    BOOK_BLFS
 
             config    LFS_relSVN
@@ -596 +596 @@
     #--- Custom Tools support
     config CUSTOM_TOOLS
-        depends !BOOK_BLFS
+        depends on !BOOK_BLFS
         bool    "Add custom tools support"
         default    n
@@ -631 +631 @@
 
 menu "General Settings"
-depends !BOOK_BLFS
+depends on !BOOK_BLFS
 
     #--- {C,H,}LFS User Account
@@ -672 +672 @@
         string "Package Archive Directory"
         default "$SRC_ARCHIVE"
-        depends GETPKG
+        depends on GETPKG
         help
             #-- A local archive for packages/files (not $BUILDDIR/sources)
@@ -681 +681 @@
         bool "Retry on 'connection refused' failure"
         default n
-        depends GETPKG
+        depends on GETPKG
         help
             #-- Attempt to download a source package again if it fails
@@ -690 +690 @@
         int "Number of retry attempts on download failures"
         default 20
-        depends GETPKG
+        depends on GETPKG
         help
             #-- Number of times to retry a failed download.
@@ -697 +697 @@
         int "Download timeout (in seconds)"
         default 30
-        depends GETPKG
+        depends on GETPKG
         help
             #-- Number of seconds to wait for a download to start before
@@ -705 +705 @@
         string "FTP mirror"
         default "http://ftp.osuosl.org"
-        depends GETPKG
+        depends on GETPKG
         help
             #-- FTP mirror to download packages and patches if not found
@@ -730 +730 @@
 
 menu "Build Settings"
-depends !BOOK_BLFS
+depends on !BOOK_BLFS
 
     #--- Test Suites
     config    CONFIG_TESTS
         bool    "Run testsuites"
-        depends    !BOOK_CLFS2 && !BOOK_CLFS3
+        depends on    !BOOK_CLFS2 && !BOOK_CLFS3
         default    y
         help
@@ -758 +758 @@
 
     menu "Test settings"
-    depends    CONFIG_TESTS
+    depends on    CONFIG_TESTS
     choice
         prompt    "Tests level"
@@ -814 +814 @@
     config  PKGMNGT
         bool    "Package management"
-        depends BOOK_LFS || BOOK_LFS_SYSD
+        depends on BOOK_LFS || BOOK_LFS_SYSD
         default n
         help
@@ -839 +839 @@
             #  For now, this only works with LFS
     choice
-        depends PKGMNGT
+        depends on PKGMNGT
         prompt "Package management style"
         default PKG_PACK
@@ -879 +879 @@
 
     config    NO_PROGRESS_BAR
-        bool "DO NOT use/display progress_bar "
+        bool "DO NOT use/display progress_bar"
         default n
         help
@@ -889 +889 @@
 
 menu "System configuration"
-    depends !BOOK_BLFS
+    depends on !BOOK_BLFS
 
     #--- FSTAB
@@ -1067 +1067 @@
             string "Default log level (1-8)"
             default "4"
-            depends BOOK_LFS
+            depends on BOOK_LFS
             help
                 This can be changed using dmesg. 1 means "no message",
@@ -1078 +1078 @@
 
 menu "Advanced Features"
-depends !BOOK_BLFS
+depends on !BOOK_BLFS
 
     config    REPORT
@@ -1084 +1084 @@
         default y
 
-    #--- ICA/farce
+    #--- ICA
     config    COMPARE
         bool "Run comparison analysis on final stage"
-        depends    !BOOK_CLFS2 && !BOOK_CLFS3
+        depends on    !BOOK_CLFS2 && !BOOK_CLFS3
         default n
         help
             #-- Should an iterative comparison analysis be performed?
             #
-            #   Unless you are familiar with ICA and/or FARCE do not
+            #   Unless you are familiar with ICA, do not
             #   select this option
             #
-            #  ICA and FARCE are analysis tools for comparing one
+            #  ICA is an analysis tool for comparing one
             #  build to the next. Builds mays differ from one iteration
-            #  to another due to the build order and these tools try
+            #  to another due to the build order and this tool try
             #  to ferret out those differences by examining the stored
             #  build logs and binary files.
@@ -1111 +1111 @@
 
     config    RUN_ICA
-        bool    "ICA testing"
-        depends on COMPARE
-        default y
-        help
-            #-- Run ICA testing
-
-    config    RUN_FARCE
-        bool    "farce testing"
-        depends on COMPARE
-        default n
-        help
-            #-- Run farce testing
-    #--- End ICA/farce
+        bool
+        default y if COMPARE
+
+    #--- End ICA
 
     #--- Optimizations
@@ -1149 +1140 @@
 
     choice
-        prompt "Optimization level "
+        prompt "Optimization level"
         default OPT_1
         help
@@ -1222 +1213 @@
             default "$LOGDIR/ICA"
 
-        config    FARCELOGDIR
-            string "farce logs directory"
-            default "$LOGDIR/farce"
-
         config    MKFILE
             string "Makefile"
@@ -1245 +1232 @@
 
 config REBUILD_MAKEFILE
-    depends !BOOK_BLFS
+    depends on !BOOK_BLFS
     bool "Rebuild the Makefile (see help)"
     default n

FUNCTION_LIST

@@ -183 +183 @@
 Description:
 --------------------------------------------------------------------------
-wrt_do_farce_work():
-From common/libs/func_compare.sh.
-Description:
---------------------------------------------------------------------------
 wrt_logs():
 From common/libs/func_compare.sh.
@@ -247 +243 @@
 Description:
 --------------------------------------------------------------------------
-function dohelp():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function emessage():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function expected():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function failure():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function fatal():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function filetype():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function message():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function onlyone():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function testar():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function testgzip():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function testso():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function tokenize():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function tokenizeanddiff():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
-function validateargs():
-From extras/farce.
-Description:
---------------------------------------------------------------------------
 process_toolchain():
 From HLFS/master.sh.

LICENSE

@@ -1 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+Copyright (C) 2005-2019, jhalfs team
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, 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.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-                            Preamble
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-  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 Library 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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 St, 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.
-
-  <signature of Ty Coon>, 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 Library General
-Public License instead of this License.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE

Makefile

@@ -6 +6 @@
 #                     Pierre Labastie
 
-TOPDIR=$(shell pwd)
 CONFIG_CONFIG_IN = Config.in
 CONFIG = menu
 
 all: menuconfig
-#       @clear
         @$$(grep RUN_ME configuration 2>/dev/null | sed -e 's@RUN_ME=\"@@' -e 's@\"@@')
 
-$(CONFIG)/conf:
-        $(MAKE) -C $(CONFIG) conf
-
-$(CONFIG)/mconf:
-        $(MAKE) -C $(CONFIG) ncurses conf mconf
-
-menuconfig: $(CONFIG)/mconf
-        @cp -a configuration configuration.old 2>/dev/null || true
-        @$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
-
-config: $(CONFIG)/conf
-        @$(CONFIG)/conf $(CONFIG_CONFIG_IN)
+menuconfig:
+        @cp -a configuration .configuration.old 2>/dev/null || true
+        @CONFIG_="" KCONFIG_CONFIG=configuration $(CONFIG)/menuconfig.py $(CONFIG_CONFIG_IN)
 
 # Clean up
@@ -31 +20 @@
 clean:
         rm -f configuration configuration.old error
-        - $(MAKE) -C $(CONFIG) clean
 
-clean-target:
-        rm -f error
-        - $(MAKE) -C $(CONFIG) clean
-
-.PHONY: all menuconfig config clean clean-target
+.PHONY: all menuconfig clean

README

@@ -205 +205 @@
                /do_ica_prep
                /do_ica_work
-               /farce
-               /filelist
 
         /optimize/opt_config

common/libs/func_compare.sh

@@ -59 +59 @@
   local DEST_TOPDIR=/${SCRIPT_ROOT}
   local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
-  local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
 
   if [[ "$RUN_ICA" = "y" ]] ; then
@@ -74 +73 @@
   fi
 
-  if [[ "$RUN_FARCE" = "y" ]] ; then
-    local DEST_FARCE=$DEST_TOPDIR/farce && \
-(
-    cat << EOF
-        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >>logs/\$@ 2>&1 && \\
-        extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >>logs/\$@ 2>&1
-EOF
-) >> $MKFILE.tmp
-    if [[ "$ITERATION" != "iteration-1" ]] ; then
-      wrt_do_farce_work "$PREV_IT" "$ITERATION" "$DEST_FARCE"
-    fi
-  fi
 }
 
@@ -92 +79 @@
 #----------------------------------#
   echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/\$@ 2>&1" >> $MKFILE.tmp
-}
-
-#----------------------------------#
-wrt_do_farce_work() {              #
-#----------------------------------#
-  local OUTPUT=$FARCELOGDIR/${1}_V_${2}
-  local PREDIR=$3/$1
-  local PREFILE=$3/filelist-$1
-  local ITEDIR=$3/$2
-  local ITEFILE=$3/filelist-$2
-  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/\$@ 2>&1" >> $MKFILE.tmp
 }
 

common/libs/func_install_blfs

@@ -23 +23 @@
 
 # Clean-up
-make -C ${BUILDDIR}${BLFS_ROOT}/menu clean
 rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
 rm -rf ${BUILDDIR}${BLFS_ROOT}/xsl/.svn

common/libs/func_validate_configs.sh

@@ -28 +28 @@
   local -r    BUILD_chroot="TEST BOMB_TEST STRIP"
   local -r    BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG"
-  local -r ADVANCED_chroot="COMPARE RUN_ICA RUN_FARCE ITERATIONS OPTIMIZE"
+  local -r ADVANCED_chroot="COMPARE RUN_ICA ITERATIONS OPTIMIZE"
   local -r ADVANCED_common="REPORT REBUILD_MAKEFILE"
 
@@ -148 +148 @@
       COMPARE)          [[ ! "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       RUN_ICA)          [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      RUN_FARCE)        [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       ITERATIONS)       [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       BOMB_TEST)        [[ ! "$TEST" = "0" ]] && echo -e "`eval echo $PARAM_VALS`" ;;

install-blfs-tools.sh

@@ -165 +165 @@
 # Clean-up
 [[ $VERBOSITY > 0 ]] && echo Cleaning the ${BUILDDIR}${BLFS_ROOT} directory
-make -C ${BUILDDIR}${BLFS_ROOT}/menu clean
-rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
-rm -rf ${BUILDDIR}${BLFS_ROOT}/xsl/.svn
-rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/.svn
-rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/lxdialog/.svn
 # We do not want to keep an old version of the book:
 rm -rf ${BUILDDIR}${BLFS_ROOT}/$BLFS_XML

jhalfs

@@ -102 +102 @@
 version="
 ${BOLD}  \"jhalfs\"${OFF} builder tool (development) \$Rev$
-  \$Date$
-
-  Written by George Boudreau, Manuel Canales Esparcia, Pierre Labastie,
-  plus several contributions.
-
-  Based on an idea from Jeremy Huntwork
-
-  This set of files are published under the
-  ${BOLD}Gnu General Public License, Version 2.${OFF}
-  See the ${BOLD}LICENSE${OFF} file in this directory.
+ \$Date$ 
+
+  Copyright (C) 2005-2019, the jhalfs team:
+    Jeremy Huntwork
+    George Boudreau
+    Manuel Canales Esparcia
+    Thomas Pegg
+    Matthew Burgess
+    Pierre Labastie
+
+  Unless specified, all the files in this directory and its sub-directories
+  are subjected to the ${BOLD}MIT license${OFF}. See the ${BOLD}LICENSE${OFF} file.
+
+  The files in the ${BOLD}menu${OFF} directory are subjected to the ${BOLD}ISC License${OFF}.
+  See ${BOLD}LICENSE.txt${OFF} and ${BOLD}README${OFF} in that directory.
 "
+
+usage="${nl_}${tab_}${BOLD}${RED}This script cannot be called directly${OFF}
+${tab_}Type ${BOLD}make${OFF} to run the tool, or
+${tab_}Type ${BOLD}./jhalfs -v${OFF} to display version information."
 
 case $1 in
   -v ) echo "$version" && exit ;;
   run ) : ;;
-  * )
-    echo "${nl_}${tab_}${BOLD}${RED}This script cannot be called directly: EXITING ${OFF}${nl_}"
-    exit 1
-    ;;
+  * ) echo "$usage" && exit 1 ;;
 esac
 
@@ -126 +132 @@
 # if he or she really wants to run this stuff
 time_current=$(stat -c '%Y' configuration 2>/dev/null || date +%s)
-time_old=$(stat -c '%Y' configuration.old 2>/dev/null || printf '%s' "$time_current")
+time_old=$(stat -c '%Y' .configuration.old 2>/dev/null || printf '%s' "$time_current")
 if [ "$(printf '%d' "$time_old")" -ge "$(printf '%d' "$time_current")" ] ; then
   printf 'Do you want to run jhalfs? yes/no (yes): '
@@ -149 +155 @@
 GETPKG=${GETPKG:-n}
 COMPARE=${COMPARE:-n}
-RUN_FARCE=${RUN_FARCE:-n}
 RUN_ICA=${RUN_ICA:-n}
 PKGMNGT=${PKGMNGT:-n}