Modify

Opened 6 years ago

Closed 4 years ago

#9982 closed defect (fixed)

Trunk temporary broken due to upstream changes

Reported by: amain Owned by: amain
Priority: blocker Milestone: milestone:trunk
Component: openwrt Version: trunk
Severity: severity 3 Keywords:
Cc:

Description

OpenWrt patch needs to be updated:

Checked out revision 37050.
touch /home/amain/trunk/build/openwrt-ar71xx-generic_Default-trunk-HEAD/.debwrt.checkout.stamp
touch openwrt/checkout
patching file include/toplevel.mk
Hunk #1 succeeded at 64 (offset 15 lines).

success: openwrt/patches/all/012_disable_all_openwrt_packages

patching file include/kernel-defaults.mk
Hunk #1 succeeded at 92 with fuzz 1 (offset -4 lines).
Hunk #2 FAILED at 108.
1 out of 2 hunks FAILED -- saving rejects to file include/kernel-defaults.mk.rej

fail: openwrt/patches/trunk/021_install_kernel_modules_and_merge_debwrt_config

make: * [openwrt/patch] Error 1

Attachments (0)

Change History (9)

comment:1 Changed 6 years ago by amain

  • Milestone changed from unscheduled to trunk
  • Owner set to amain
  • Status changed from new to assigned

comment:2 Changed 6 years ago by amain

  • Priority changed from minor to blocker
  • Severity changed from severity 4 to severity 3

comment:3 Changed 6 years ago by amain

  • Summary changed from Truck temporary broken due to upstream changes to Trunk temporary broken due to upstream changes

comment:4 Changed 6 years ago by amain

Several patches have been applied. Waiting for CI to complete a successful build.

comment:5 Changed 6 years ago by amain

  • Resolution set to fixed
  • Status changed from assigned to closed

Trunk compiles fine again.

comment:6 Changed 5 years ago by deepa.garia@…

  • Resolution fixed deleted
  • Status changed from closed to reopened

I get this error
patching file include/toplevel.mk
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- saving rejects to file include/toplevel.mk.rej

fail: openwrt/patches/all/012_disable_all_openwrt_packages

make: * [openwrt/patch] Error 1

Tried googling but didn't get any solution

comment:7 Changed 5 years ago by deepa

forgot to mention. revision 44597

comment:8 Changed 5 years ago by gotnone

Change that breaks this was included in openwrt revision 42002.

Proposed patch change for openwrt/patches/all/012_disable_all_openwrt_packages:

--- openwrt/include/toplevel.mk.org	2010-01-02 00:28:44.000000000 +0100
+++ openwrt/include/toplevel.mk	2010-01-02 00:14:07.000000000 +0100
@@ -49,6 +49,11 @@
 		[ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
 	done
	[ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
+	# DebWrt: we don't need to build any packages by default, so we disable them 
+	#         all. This allows us to have fine control over which packages we
+	#         want to build.
+	sed 's/default [ynm]/default n/g' tmp/.config-package.in > tmp/.config-package.in.new
+	mv tmp/.config-package.in.new tmp/.config-package.in
 	./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
 	touch $(TOPDIR)/tmp/.build

comment:9 Changed 4 years ago by amain

  • Resolution set to fixed
  • Status changed from reopened to closed

Thanks for helping by supplying this patch. It has been included in r673.

Add Comment

Modify Ticket

Action
as closed The owner will remain amain.
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.