| Newsgroups |
gmane.linux.lfs.automated,gmane.linux.lfs.beyond.devel |
| Message-ID |
<[email protected]> |
On Wed, 2024-12-04 at 14:35 +0800, Zhang Wen wrote:
> diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh
> index 7296ff4..3d77355 100755
> --- a/BLFS/gen-special.sh
> +++ b/BLFS/gen-special.sh
> @@ -109,7 +109,8 @@ cat >tmpfile << EOF
> EOF
> for file in $(ls ${BLFS_DIR}/x/installing/x7* | grep -v x7driver) \
> ${BLFS_DIR}/kde/kf6/kf6-frameworks.xml \
> - ${BLFS_DIR}/kde/plasma/plasma-all.xml; do
> + ${BLFS_DIR}/kde/plasma/plasma-all.xml \
> + ${BLFS_DIR}/x/installing/xcb-utilities.xml; do
This hunk fails to apply. Please ensure the patch can be applied with
git am on top of current trunk.
> id=$(grep xreflabel $file | sed 's@.*id="\([^"]*\).*@\1@')
> cat >>$SPECIAL_FILE << EOF
> <xsl:when test="@id='$id'">
> @@ -137,7 +138,7 @@ EOF
>
> precpack=NONE
> for pack in $list_cat; do
> - if grep -q x7 $file; then # this is an xorg package
> + if grep -q -e 'x7\|xcb' $file; then # this is an xorg package
Wouldn't this match things like libxcb, xcb-proto, and etc. incorrectly?
And why use "-e" and "\|"? In extended regexp "|" itself (w/o "\") is a
meta-character.
/* snip */
> <xsl:when test="contains(../name,'xorg') or
> contains(../name,'plasma') or
> - contains(../name,'kf5')">
> + contains(../name,'kf5') or
> + contains(../name,'xcb-utilities')">
Don't change indent from space to tab for no reason.
--
Xi Ruoyao <[email protected]>
School of Aerospace Science and Technology, Xidian University
--
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page