diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 22:56:34 +0200 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 22:56:34 +0200 |
| commit | a89111ad91782cad8792417e0e70e03448af0d06 (patch) | |
| tree | d9357944733350266973c68ae34c133c002ef3f9 | |
| parent | f7b02f713c4b56504d7b2656b5ccddb4f960a82c (diff) | |
changed order of packages built
| -rw-r--r-- | src/shared/deptree.sh | 18 | ||||
| -rw-r--r-- | src/stage3/patches/systemd.patch | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/shared/deptree.sh b/src/shared/deptree.sh index c01b2ca..77603fb 100644 --- a/src/shared/deptree.sh +++ b/src/shared/deptree.sh @@ -55,7 +55,7 @@ prepare_deptree() { deptree_next() { local pkg - pkg=$(grep '\[ *\]' "$DEPTREE" | tail -n1 | awk '{print $1}') + pkg=$(grep '\[ *\]' "$DEPTREE" | head -n1 | awk '{print $1}') [ -n "$pkg" ] || return "$ERROR_MISSING" echo "$pkg" } @@ -97,12 +97,20 @@ deptree_check_depend() { } deptree_add_entry() { - local r="${2:-<cmd>}" + local r="${2:-<cmdline>}" - if ! grep -q "^$1 :" "$DEPTREE".FULL; then + if grep -q "^$1 :" "$DEPTREE".FULL; then + # if pkg is in deptree, append requestee to list + sed -i "/#.* $r\\(\$\\|[ ,]\\)/! s/^$1 : \\[.*/&, $r/" "$DEPTREE"* + elif grep -q "^$r :" "$DEPTREE".FULL; then + # elif requestee is in deptree, insert after requestee + sed -i "/^$r :/a $1 : [ ] # $r" "$DEPTREE"* + elif [ "x$r" == "x<cmdline>" ]; then + # elif requested directly, add to top of file + sed -i "1i $1 : [ ] # $r" "$DEPTREE"* + else + # else append to deptree echo "$1 : [ ] # $r" >> "$DEPTREE".FULL [ -f "$DEPTREE" ] && echo "$1 : [ ] # $r" >> "$DEPTREE" - else - sed -i "/#.* $r\\(\$\\|[ ,]\\)/! s/^$1 : \\[.*/&, $r/" "$DEPTREE"* fi } diff --git a/src/stage3/patches/systemd.patch b/src/stage3/patches/systemd.patch index fff02ad..b387e66 100644 --- a/src/stage3/patches/systemd.patch +++ b/src/stage3/patches/systemd.patch @@ -6,8 +6,8 @@ '5cbaad2f6795088db56063d20695c6444595822f' + # basic/macros: rename noreturn into _noreturn_ (#8456) + '848e863acc51ecfb0f3955c498874588201d9130' -+ # libmount: include sys/mount.h only if necessary (#8507) -+ '061d1a51097c3c025ff46173f10aa135f9a610d4' ++ # core: don't include libmount.h in a header file (#8580) ++ '4af61b251099b1fed4c816a464f8068972a7145c' ) _reverts=( |