Skip to content

Commit 0eb8bee

Browse files
authored
Merge branch 'main' into sort-debug-keys
2 parents b0f6290 + ee39b35 commit 0eb8bee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1975
-689
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ RUN apt-get update \
1212
gcc \
1313
gdb \
1414
gperf \
15-
jq \
1615
libacl1-dev \
1716
libattr1-dev \
1817
libcap-dev \

.github/workflows/CICD.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ jobs:
465465
run: |
466466
## Install dependencies
467467
sudo apt-get update
468-
sudo apt-get install jq libselinux1-dev libsystemd-dev
468+
sudo apt-get install libselinux1-dev libsystemd-dev
469469
- name: "`make install`"
470470
shell: bash
471471
run: |
@@ -579,14 +579,14 @@ jobs:
579579
# - { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: feat_selinux , use-cross: use-cross }
580580
- { os: ubuntu-latest , target: i686-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
581581
- { os: ubuntu-latest , target: i686-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
582-
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
582+
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross, skip-publish: true }
583583
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,uudoc" , use-cross: no, workspace-tests: true }
584584
- { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
585585
- { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
586586
- { os: ubuntu-latest , target: wasm32-unknown-unknown , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
587587
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
588-
# PR #7964: Mac should still build even if the feature is not enabled
589-
- { os: macos-latest , target: aarch64-apple-darwin , workspace-tests: true } # M1 CPU
588+
# PR #7964: Mac should still build even if the feature is not enabled. Do not publish this.
589+
- { os: macos-latest , target: aarch64-apple-darwin , workspace-tests: true, skip-publish: true } # M1 CPU
590590
- { os: macos-latest , target: x86_64-apple-darwin , features: feat_os_macos, workspace-tests: true }
591591
- { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
592592
- { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows }
@@ -637,7 +637,6 @@ jobs:
637637
case '${{ matrix.job.target }}' in
638638
aarch64-*) TARGET_ARCH=arm64 ;;
639639
arm-*-*hf) TARGET_ARCH=armhf ;;
640-
i586-*) TARGET_ARCH=i586 ;;
641640
i686-*) TARGET_ARCH=i686 ;;
642641
x86_64-*) TARGET_ARCH=x86_64 ;;
643642
esac;
@@ -713,7 +712,6 @@ jobs:
713712
shell: bash
714713
run: |
715714
## Create build/work space
716-
mkdir -p '${{ steps.vars.outputs.STAGING }}'
717715
mkdir -p '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}'
718716
- name: Install/setup prerequisites
719717
shell: bash
@@ -1121,11 +1119,6 @@ jobs:
11211119
;;
11221120
esac
11231121
1124-
case '${{ matrix.job.os }}' in
1125-
# Update binutils if MinGW due to https://github.com/rust-lang/rust/issues/112368
1126-
windows-latest) C:/msys64/usr/bin/pacman.exe -Sy --needed mingw-w64-x86_64-gcc --noconfirm ; echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH ;;
1127-
esac
1128-
11291122
## Install the llvm-tools component to get access to `llvm-profdata`
11301123
rustup component add llvm-tools
11311124

.github/workflows/GnuTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
- name: Install dependencies in VM
240240
run: |
241241
lima sudo dnf -y update
242-
lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex wget automake patch quilt
242+
lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex automake patch quilt
243243
lima rustup-init -y --default-toolchain stable
244244
- name: Copy the sources to VM
245245
run: |

.github/workflows/code-quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
- name: Install/setup prerequisites
175175
shell: bash
176176
run: |
177-
sudo apt-get -y update ; sudo apt-get -y install npm ; sudo npm install cspell -g ;
177+
sudo npm install cspell -g ;
178178
- name: Run `cspell`
179179
shell: bash
180180
run: |

.github/workflows/freebsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
disable_annotations: true
4545
- name: Prepare, build and test
46-
uses: vmactions/freebsd-vm@v1.2.7
46+
uses: vmactions/freebsd-vm@v1.2.8
4747
with:
4848
usesh: true
4949
sync: rsync
@@ -139,7 +139,7 @@ jobs:
139139
with:
140140
disable_annotations: true
141141
- name: Prepare, build and test
142-
uses: vmactions/freebsd-vm@v1.2.7
142+
uses: vmactions/freebsd-vm@v1.2.8
143143
with:
144144
usesh: true
145145
sync: rsync

.github/workflows/l10n.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
- name: Install/setup prerequisites
142142
shell: bash
143143
run: |
144-
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev locales
144+
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
145145
sudo locale-gen --keep-existing fr_FR.UTF-8
146146
locale -a | grep -i fr || exit 1
147147
- name: Build coreutils with clap localization support
@@ -312,7 +312,7 @@ jobs:
312312
shell: bash
313313
run: |
314314
## Install/setup prerequisites
315-
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev locales
315+
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
316316
- name: Generate French locale
317317
shell: bash
318318
run: |
@@ -429,10 +429,10 @@ jobs:
429429
## Install/setup prerequisites
430430
case '${{ matrix.job.os }}' in
431431
ubuntu-*)
432-
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev build-essential
432+
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
433433
;;
434434
macos-*)
435-
brew install coreutils make
435+
brew install coreutils
436436
;;
437437
esac
438438
- name: Install via make and test multi-call binary
@@ -453,22 +453,22 @@ jobs:
453453
454454
# First check if binary exists after build
455455
echo "Checking if coreutils was built..."
456-
ls -la target/release/coreutils || echo "No coreutils binary in target/release/"
456+
ls -la target/release-small/coreutils || echo "No coreutils binary in target/release-small/"
457457
458-
make FEATURES="${{ matrix.job.features }}" PROFILE=release MULTICALL=y
458+
make FEATURES="${{ matrix.job.features }}" PROFILE=release-small MULTICALL=y
459459
460-
echo "After build, checking target/release/:"
461-
ls -la target/release/ | grep -E "(coreutils|^total)" || echo "Build may have failed"
460+
echo "After build, checking target/release-small/:"
461+
ls -la target/release-small/ | grep -E "(coreutils|^total)" || echo "Build may have failed"
462462
463463
echo "Running make install..."
464464
echo "Before install - checking what we have:"
465-
ls -la target/release/coreutils 2>/dev/null || echo "No coreutils in target/release"
465+
ls -la target/release-small/coreutils 2>/dev/null || echo "No coreutils in target/release-small"
466466
467467
# Run make install with verbose output to see what happens
468-
echo "About to run: make install DESTDIR=\"$INSTALL_DIR\" PREFIX=/usr PROFILE=release MULTICALL=y"
468+
echo "About to run: make install DESTDIR=\"$INSTALL_DIR\" PREFIX=/usr PROFILE=release-small MULTICALL=y"
469469
echo "Expected install path: $INSTALL_DIR/usr/bin/coreutils"
470470
471-
make install DESTDIR="$INSTALL_DIR" PREFIX=/usr PROFILE=release MULTICALL=y || {
471+
make install DESTDIR="$INSTALL_DIR" PREFIX=/usr PROFILE=release-small MULTICALL=y || {
472472
echo "Make install failed! Exit code: $?"
473473
echo "Let's see what happened:"
474474
ls -la "$INSTALL_DIR" 2>/dev/null || echo "Install directory doesn't exist"
@@ -482,13 +482,13 @@ jobs:
482482
echo "Current directory: $(pwd)"
483483
echo "INSTALL_DIR: $INSTALL_DIR"
484484
echo "Checking if build succeeded..."
485-
if [ -f "target/release/coreutils" ]; then
486-
echo "✓ Build succeeded - coreutils binary exists in target/release/"
487-
ls -la target/release/coreutils
485+
if [ -f "target/release-small/coreutils" ]; then
486+
echo "✓ Build succeeded - coreutils binary exists in target/release-small/"
487+
ls -la target/release-small/coreutils
488488
else
489-
echo "✗ Build failed - no coreutils binary in target/release/"
490-
echo "Contents of target/release/:"
491-
ls -la target/release/ | head -20
489+
echo "✗ Build failed - no coreutils binary in target/release-small/"
490+
echo "Contents of target/release-small/:"
491+
ls -la target/release-small/ | head -20
492492
exit 1
493493
fi
494494
@@ -580,13 +580,13 @@ jobs:
580580
## Install/setup prerequisites
581581
case '${{ matrix.job.os }}' in
582582
ubuntu-*)
583-
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev build-essential locales
583+
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
584584
# Generate French locale for testing
585585
sudo locale-gen --keep-existing fr_FR.UTF-8
586586
locale -a | grep -i fr || echo "French locale generation may have failed"
587587
;;
588588
macos-*)
589-
brew install coreutils make
589+
brew install coreutils
590590
;;
591591
esac
592592
- name: Test Make installation
@@ -600,8 +600,8 @@ jobs:
600600
mkdir -p "$MAKE_INSTALL_DIR"
601601
602602
# Build and install using make with DESTDIR
603-
make FEATURES="${{ matrix.job.features }}" PROFILE=release MULTICALL=y
604-
make install DESTDIR="$MAKE_INSTALL_DIR" PREFIX=/usr PROFILE=release MULTICALL=y
603+
make FEATURES="${{ matrix.job.features }}" PROFILE=release-small MULTICALL=y
604+
make install DESTDIR="$MAKE_INSTALL_DIR" PREFIX=/usr PROFILE=release-small MULTICALL=y
605605
606606
# Verify installation
607607
echo "Testing make-installed binaries..."
@@ -912,7 +912,7 @@ jobs:
912912
run: |
913913
## Install/setup prerequisites including locale support
914914
sudo apt-get -y update
915-
sudo apt-get -y install libselinux1-dev locales build-essential
915+
sudo apt-get -y install libselinux1-dev
916916
917917
# Generate multiple locales for testing
918918
sudo locale-gen --keep-existing en_US.UTF-8 fr_FR.UTF-8 de_DE.UTF-8 es_ES.UTF-8
@@ -928,8 +928,8 @@ jobs:
928928
mkdir -p "$INSTALL_DIR"
929929
930930
# Build and install using make with DESTDIR
931-
make FEATURES="feat_os_unix" PROFILE=release MULTICALL=y
932-
make install DESTDIR="$INSTALL_DIR" PREFIX=/usr PROFILE=release MULTICALL=y
931+
make FEATURES="feat_os_unix" PROFILE=release-small MULTICALL=y
932+
make install DESTDIR="$INSTALL_DIR" PREFIX=/usr PROFILE=release-small MULTICALL=y
933933
934934
# Debug: Show what was installed
935935
echo "Contents of installation directory:"
@@ -1109,8 +1109,8 @@ jobs:
11091109
11101110
# Clean and build standard version
11111111
make clean
1112-
make FEATURES="feat_os_unix" PROFILE=release MULTICALL=y
1113-
make install DESTDIR="$STANDARD_BUILD_INSTALL_DIR" PREFIX=/usr PROFILE=release MULTICALL=y
1112+
make FEATURES="feat_os_unix" PROFILE=release-small MULTICALL=y
1113+
make install DESTDIR="$STANDARD_BUILD_INSTALL_DIR" PREFIX=/usr PROFILE=release-small MULTICALL=y
11141114
11151115
# Verify standard build binary works
11161116
if "$STANDARD_BUILD_INSTALL_DIR/usr/bin/coreutils" --version >/dev/null 2>&1; then
@@ -1160,7 +1160,7 @@ jobs:
11601160
# Use different cache key for each build to avoid conflicts
11611161
key: cat-locale-embedding
11621162
- name: Install prerequisites
1163-
run: sudo apt-get -y update && sudo apt-get -y install libselinux1-dev build-essential
1163+
run: sudo apt-get -y update && sudo apt-get -y install libselinux1-dev
11641164
- name: Build cat with targeted locale embedding
11651165
run: UUCORE_TARGET_UTIL=cat cargo build -p uu_cat --release
11661166
- name: Verify cat locale count
@@ -1192,7 +1192,7 @@ jobs:
11921192
# Use different cache key for each build to avoid conflicts
11931193
key: ls-locale-embedding
11941194
- name: Install prerequisites
1195-
run: sudo apt-get -y update && sudo apt-get -y install libselinux1-dev build-essential
1195+
run: sudo apt-get -y update && sudo apt-get -y install libselinux1-dev
11961196
- name: Build ls with targeted locale embedding
11971197
run: UUCORE_TARGET_UTIL=ls cargo build -p uu_ls --release
11981198
- name: Verify ls locale count
@@ -1224,7 +1224,7 @@ jobs:
12241224
# Use different cache key for each build to avoid conflicts
12251225
key: multicall-locale-embedding
12261226
- name: Install prerequisites
1227-
run: sudo apt-get -y update && sudo apt-get -y install libselinux1-dev build-essential
1227+
run: sudo apt-get -y update && sudo apt-get -y install libselinux1-dev
12281228
- name: Build multicall binary with all locales
12291229
run: cargo build --release
12301230
- name: Verify multicall locale count
@@ -1264,7 +1264,7 @@ jobs:
12641264
- name: Install prerequisites
12651265
run: |
12661266
sudo apt-get -y update
1267-
sudo apt-get -y install libselinux1-dev locales
1267+
sudo apt-get -y install libselinux1-dev
12681268
# Generate French locale for testing
12691269
sudo locale-gen --keep-existing fr_FR.UTF-8
12701270
locale -a | grep -i fr || exit 1

.vscode/cspell.dictionaries/jargon.wordlist.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ duplicative
4141
dsync
4242
endianness
4343
enqueue
44+
ERANGE
4445
errored
4546
executable
4647
executables
@@ -188,3 +189,16 @@ nofield
188189
# * clippy
189190
uninlined
190191
nonminimal
192+
193+
# * CPU/hardware features
194+
ASIMD
195+
asimd
196+
hwcaps
197+
PCLMUL
198+
pclmul
199+
PCLMULQDQ
200+
pclmulqdq
201+
TUNABLES
202+
tunables
203+
VMULL
204+
vmull

0 commit comments

Comments
 (0)