build: fixup 9534357 typo

[aparcar]

Fixup 9534357 which added a non existing packages to the packages-y
list.

Reported-by: Jonas Albrecht plonkbong100@protonmail.com
Reported-by: Rosen Penev rosenp@gmail.com
Signed-off-by: Paul Spooren mail@aparcar.org

[aparcar]

@nbd168 ping

[aparcar]

@blogic ping

[adschm]

Can you please change the commit title so it tells what you are changing?

[adschm]

And please add a proper:

Fixes: 12digitcommit id ("commit title")

to the commit message.

[neheb]

ACK. This is breaking the buildbot in the packages feed. Almost all the red arrows are a result of this: https://github.com/openwrt/packages/pulls

[nbd168]

Having 'kernel/linux' in there is not a typo. The main problem is the fact that the SDK and the main build system have the 'linux' package in different subdirectories. I'll fix that part instead, so we don't need this PR.

[nbd168]

Please try this commit: https://git.openwrt.org/?p=openwrt/staging/nbd.git;a=commitdiff;h=921d4500825f837335f998656f0bb88ef0920d55

[aparcar]

Tested and works, I'd suggest to create the kernel folder like shown below to save a mkdir call.

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 022a791ebf..67061861c0 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -82,7 +82,7 @@ KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(
 all: compile
 
 $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
-       mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
+       mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package/kernel
        $(CP) -L $(INCLUDE_DIR) $(SCRIPT_DIR) $(SDK_BUILD_DIR)/
        $(TAR) -cf - -C $(TOPDIR) \
                `cd $(TOPDIR); find $(KDIR_BASE)/ -name \*.ko` \
@@ -132,8 +132,10 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
        $(CP) \
                $(TOPDIR)/package/Makefile \
                $(TOPDIR)/package/libs/toolchain \
-               $(TOPDIR)/package/kernel/linux \
                $(SDK_BUILD_DIR)/package/
+       $(CP) \
+               $(TOPDIR)/package/kernel/linux \
+               $(SDK_BUILD_DIR)/package/kernel
 
        -rm -rf $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/.prereq-build
 

[predators46]

no changes in the master branch

[aparcar]

@nbd168 ping

[BKPepe]

@adschm @ynezz This is unbelievable. Is anybody willing to do some changes to the master branch?
Package maintainers in packages repository are merging bumps, bug fixes even though almost all checks are failing there!

What we should do with this? We are now sitting here and waiting to fix the culprit for at least a week here!

Ping: @nbd168

[adschm]

@BKPepe This touches an area I have almost no experience with. Broken or not, I certainly won't mess with something I don't understand.

[BKPepe]

So rather leaving it as broken and looking bad (failed checks) instead of reverting it. Did I understand it correctly or not? Anyway, @blocktrron cherry-picked it.

[predators46]

So rather leaving it as broken and looking bad (failed checks) instead of reverting it. Did I understand it correctly or not? Anyway, @blocktrron cherry-picked it.

the problem is here
package-y + = kernel/linux

[adschm]

So rather leaving it as broken and looking bad (failed checks) instead of reverting it. Did I understand it correctly or not?

Yes, it's not my job to clean up behind others. Experience tells that people messing with or trying to fix stuff they don't understand don't make it better anyway.
Apart from that, this was opened and closed by aparcar, so it actually did look like someone is taking care anyway.

[aparcar]

Apart from that, this was opened and closed by aparcar, so it actually did look like someone is taking care anyway.

Yes I close PRs here once they are pulled into staging trees. I didn't except nothing would follow after the cherry-pick. Anyway, I'll leave future PRs open.