Compile image error

[james789]

Hi,

I'm compiling image for my R7800, ipq806x, I got a patch error

Code: Select all

Applying /media/james/E/gargoyle/patches-generic//004-fix_postinst_prerm_scripts.patch using plaintext: 
patching file package/base-files/files/lib/functions.sh
Hunk #3 FAILED at 246.
Hunk #4 succeeded at 271 (offset 12 lines).
Hunk #5 succeeded at 296 (offset 17 lines).
1 out of 5 hunks FAILED -- saving rejects to file package/base-files/files/lib/functions.sh.rej
Patch failed!  Please fix /media/james/E/gargoyle/patches-generic//004-fix_postinst_prerm_scripts.patch!

do you have an idea?

[Lantis]

Post your full command output please.

Is this still a vanilla build or have you modified anything?

[Lantis]

You are almost certainly on the wrong branch.
Confirm with "git log". Latest commit it b0c923bf7b12326a9d2ba31dd8f361aefa620864

Your checkout command is probably wrong.

git checkout -b base_on_openwrt_2305 origin/base_on_openwrt_2305

Is the correct command.

[james789]

Post your full command output please.

Is this still a vanilla build or have you modified anything?

I just did that:

Code: Select all

git clone https://github.com/ericpaulbishop/gargoyle.git
cd gargoyle
git checkout -b base_on_openwrt_2305
make FULL_BUILD=true ipq806x

but I restarted from scratch right now, cause I made a successful build the first time with:

Code: Select all

git clone https://github.com/lantis1008/gargoyle.git gargoyle
cd gargoyle
git checkout -b test/remotes/origin/base_on_openwrt_2305
make ipq806x FULL_BUILD=true 

but I got error after that whenI tried something else.


*EDIT - The build is successfull.

Code: Select all

Signing package index...
make[3]: Leaving directory '/media/james/E/gargoyle/ipq806x-src'
export MAKEFLAGS= ;make -w -r json_overview_image_info
make[3]: Entering directory '/media/james/E/gargoyle/ipq806x-src'
make[3]: Nothing to be done for 'json_overview_image_info'.
make[3]: Leaving directory '/media/james/E/gargoyle/ipq806x-src'
export MAKEFLAGS= ;make -w -r checksum
make[3]: Entering directory '/media/james/E/gargoyle/ipq806x-src'
make[3]: Leaving directory '/media/james/E/gargoyle/ipq806x-src'
make[2]: Leaving directory '/media/james/E/gargoyle/ipq806x-src'
make[1]: Leaving directory '/media/james/E/gargoyle/ipq806x-src'

[james789]

You are almost certainly on the wrong branch.
Confirm with "git log". Latest commit it b0c923bf7b12326a9d2ba31dd8f361aefa620864

Your checkout command is probably wrong.

git checkout -b base_on_openwrt_2305 origin/base_on_openwrt_2305

Is the correct command.

Code: Select all

james@pop-os:/media/james/E/gargoyle$ git log
commit ae547ce5113ce1c6e260112bcdcab9f41e3e7ab8 (HEAD -> base_on_openwrt_2305, origin/master, origin/HEAD, master)
Author: Michael Gray <michael.gray@lantisproject.com>
Date:   Thu Feb 8 22:43:37 2024 +1100

    gargoyle-firewall-util: Fix quotas throttle (non-QoS) not applying
    - Partially due to missing prio scheduler (fixed in dab78a49)
    Fixes #997

commit dab78a4944da75011919b66688b13d1d5c965fb8
Author: Michael Gray <michael.gray@lantisproject.com>
Date:   Thu Feb 8 22:42:19 2024 +1100

    qos-gargoyle: Fix quotas not redirecting traffic to correct QoS classes
    Fixes #997

commit f3f58097270cb2daf3aca0e71d4112b0c1b4031e
Merge: ab2fd33f 3ab22859
Author: Michael Gray <michael.gray@lantisproject.com>
Date:   Sat Dec 23 14:37:54 2023 +1100

    Merge remote-tracking branch 'obsy/master'

[james789]

in downloaded, we can see 22.03 ?
https://ibb.co/TRZWxZv

[Lantis]

You are on the wrong branch, like I said many times.

Please check out the right branch and start from scratch.
The command you used created a NEW branch from MASTER. It did not create a branch to track base_on_openwrt_2305.

The syntax is confusing I know. Look at what I posted in this thread vs what you did.

[james789]

Ok I see and I will, but for now, with I did earlier, I got a successful build and I flashed my router with it, I can see on the overview page : build 1.15....

[Lantis]

But it isn’t the latest development effort…