Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sdk: do not exclude all doc directories #12563

Merged
merged 1 commit into from
May 8, 2023

Conversation

mcprat
Copy link
Contributor

@mcprat mcprat commented May 8, 2023

this is untested but very simple fix...

bulldbot errors in building gettext using the sdk...

/builder/shared-workdir/build/sdk/staging_dir/host/share/gnulib/gnulib-tool: *** file /builder/shared-workdir/build/sdk/staging_dir/host/share/gnulib/doc/relocatable.texi not found
/builder/shared-workdir/build/sdk/staging_dir/host/share/gnulib/gnulib-tool: *** Stop.

Some packages which are using local gnulib source
are expecting files to exist in the directory:

staging_dir/host/share/gnulib/doc

so delete the other doc directories directly
instead of excluding all of them.

Fixes: d167adb ("gettext-full: bootstrap to local gnulib source")

@Ansuel
Copy link
Member

Ansuel commented May 8, 2023

@mpratt14 anyone confirming this works?

@httpstorm
Copy link
Contributor

@mpratt14 @Ansuel
Builds fine on macOS 12.6.5. I selected WRT3200ACM, and everything from utils/coreutils. If you know what packages are affected, I can add them to the build and come back with results. I also updated my routers today: the latest master builds fine on both macOS and Linux. Targets: WRT3200ACM, x64, TL-WR1043NDv4.
Unrelated question: I have some private packages, where the sources are located on the local machine. Whenever I push anything to my fork, the build-bot tries to compile them and the build fails because the sources cannot be found. How do I exclude them from the build-bot?

@mcprat
Copy link
Contributor Author

mcprat commented May 8, 2023

@httpstorm remember this PR is for the sdk only

@mcprat
Copy link
Contributor Author

mcprat commented May 8, 2023

anyone can verify by building the SDK and unpacking it and seeing that the file exists inside

staging_dir/host/share/gnulib/doc/relocatable.texi

if no one else tests this then I will soon but I'm busy right now

@httpstorm
Copy link
Contributor

httpstorm commented May 8, 2023

@mpratt14

@httpstorm remember this PR is for the sdk only

In that case I just cloned your fork and compiled the tools-gnulib-sdk branch. I don't know how to use any other SDK or build environment.

@mcprat
Copy link
Contributor Author

mcprat commented May 8, 2023

make target/sdk/compile

and then the sdk will be in the bin directory somewhere

unpack it somewhere else and verify that it has the file

@httpstorm
Copy link
Contributor

httpstorm commented May 8, 2023

@mpratt14
Nice feature. Thanks for explaining! It took only a few seconds to generate the SDK. It does have the file:

-rw-r--r--  1 g  staff  2833 May  8 02:33 bin/targets/mvebu/cortexa9/openwrt-sdk-mvebu-cortexa9_gcc-12.2.0_musl_eabi.Darwin-x86_64/staging_dir/host/share/gnulib/doc/relocatable.texi

Some packages which are using local gnulib source
are expecting files to exist in the directory:

staging_dir/host/share/gnulib/doc

so delete the other doc directories directly
instead of excluding all of them.

Fixes: d167adb ("gettext-full: bootstrap to local gnulib source")
Signed-off-by: Michael Pratt <mcpratt@pm.me>
@openwrt-bot openwrt-bot merged commit 7bfe7e0 into openwrt:master May 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants