diff options
| author | Pierre Labastie <pierre.labastie@neuf.fr> | 2021-09-01 16:53:14 +0200 |
|---|---|---|
| committer | Pierre Labastie <pierre.labastie@neuf.fr> | 2021-09-01 16:53:14 +0200 |
| commit | 74bc5473c3745fa8947b0151b3bd951542b28286 (patch) | |
| tree | 9215341b991bf8650d58533fe9c0d48d33c13ca9 | |
| parent | 7f5f7e67774ac3d1b8bb5c38c635ddeaeb3611e4 (diff) | |
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!
| -rwxr-xr-x | make-aux-files.sh | 2 | ||||
| -rw-r--r-- | packages.ent | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/make-aux-files.sh b/make-aux-files.sh index ad8bcea6f..9cb1adbff 100755 --- a/make-aux-files.sh +++ b/make-aux-files.sh @@ -3,7 +3,7 @@ rm -f lfs-bootscripts*.tar.?z* # 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 # Create the tarball and clean up diff --git a/packages.ent b/packages.ent index f710b8e50..db17e9afc 100644 --- a/packages.ent +++ b/packages.ent @@ -421,6 +421,10 @@ <!ENTITY less-fin-du "4.2 MB"> <!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 --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> |