Changeset 74bc547

Timestamp:

09/01/2021 02:53:14 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, arm, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

9bfd0b53

Parents:

7f5f7e67

Message:

Fix make-aux-file for lfs-bootscript entities

now, grep returns two lines. Keep only the first one, and
add a comment in packages;ent so that the first line is the
one we want!

Files:

• make-aux-files.sh (modified) (1 diff)
• packages.ent (modified) (1 diff)

make-aux-files.sh

@@ -4 +4 @@
 
 # Get base file name and move bootscripts directory to that name
-version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2`
+version=`grep "ENTITY lfs-bootscripts-version" packages.ent | head -n1| cut -d'"' -f2`
 mv bootscripts lfs-bootscripts-$version
 

packages.ent

@@ -422 +422 @@
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
+<!-- For all other packages with conditional entities,
+     the order sysv--systemd is not important.
+     But for lfs-bootscript, sysv must be before systemd, for the
+     sake of make-aux-files.sh -->
 <![ %sysv; [
 <!ENTITY lfs-bootscripts-version "20210608">      <!-- Scripts depend on this format -->