Ubuntu
ipxe package

Merge lp://staging/~lynxman/ubuntu/precise/ipxe/newsnapshot into lp://staging/ubuntu/precise/ipxe

Precise (12.04)
newsnapshot
Merge into precise

Proposed by Marc Cluet on 2012-01-12

Status:	Merged
Merge reported by:	James Page
Merged at revision:	not available
Proposed branch:	lp://staging/~lynxman/ubuntu/precise/ipxe/newsnapshot
Merge into:	lp://staging/ubuntu/precise/ipxe
Diff against target:	106244 lines (+81146/-21640) 182 files modified .pc/applied-patches (+0/-1) .pc/baseroms-target.diff/src/Makefile.housekeeping (+0/-1153) debian/changelog (+17/-0) debian/control (+1/-1) debian/copyright (+1/-1) debian/ipxe.install (+3/-1) debian/patches/disable-baddrivers.diff (+34/-0) debian/patches/qemu-target.diff (+13/-0) debian/patches/series (+2/-0) debian/rules (+30/-1) src/Makefile (+3/-1) src/Makefile.housekeeping (+0/-1) src/arch/i386/Makefile.pcbios (+1/-0) src/arch/i386/core/cmdline.c (+0/-123) src/arch/i386/core/relocate.c (+16/-9) src/arch/i386/core/runtime.c (+249/-0) src/arch/i386/drivers/net/undi.c (+1/-1) src/arch/i386/drivers/net/undinet.c (+31/-8) src/arch/i386/drivers/net/undionly.c (+10/-2) src/arch/i386/include/bits/errfile.h (+1/-0) src/arch/i386/include/pxe.h (+48/-3) src/arch/i386/include/pxe_api.h (+6/-118) src/arch/i386/interface/pxe/pxe_call.c (+41/-273) src/arch/i386/interface/pxe/pxe_exit_hook.c (+60/-0) src/arch/i386/interface/pxe/pxe_file.c (+56/-59) src/arch/i386/interface/pxe/pxe_preboot.c (+83/-31) src/arch/i386/interface/pxe/pxe_tftp.c (+19/-5) src/arch/i386/interface/pxe/pxe_udp.c (+18/-4) src/arch/i386/interface/pxe/pxe_undi.c (+383/-137) src/arch/i386/interface/syslinux/comboot_call.c (+2/-2) src/arch/i386/prefix/exeprefix.S (+1/-1) src/arch/i386/prefix/kkkpxeprefix.S (+19/-0) src/arch/i386/prefix/libprefix.S (+19/-24) src/arch/i386/prefix/lkrnprefix.S (+13/-2) src/arch/i386/prefix/pxeprefix.S (+9/-6) src/arch/i386/prefix/romprefix.S (+10/-16) src/arch/i386/prefix/undiloader.S (+3/-1) src/arch/i386/transitions/liba20.S (+6/-3) src/arch/i386/transitions/librm.S (+14/-14) src/config/defaults/pcbios.h (+2/-0) src/config/general.h (+6/-6) src/core/assert.c (+30/-0) src/core/exec.c (+55/-0) src/core/getopt.c (+5/-0) src/core/image.c (+6/-2) src/crypto/asn1.c (+48/-27) src/crypto/x509.c (+1/-1) src/drivers/infiniband/arbel.c (+537/-280) src/drivers/infiniband/arbel.h (+34/-2) src/drivers/infiniband/hermon.c (+1043/-921) src/drivers/infiniband/hermon.h (+23/-2) src/drivers/infiniband/linda.c (+2430/-0) src/drivers/infiniband/linda.h (+276/-0) src/drivers/infiniband/linda_fw.c (+1069/-0) src/drivers/net/ath/ath.h (+239/-0) src/drivers/net/ath/ath5k/ath5k.c (+1698/-0) src/drivers/net/ath/ath5k/ath5k.h (+1279/-0) src/drivers/net/ath/ath5k/ath5k_attach.c (+340/-0) src/drivers/net/ath/ath5k/ath5k_caps.c (+154/-0) src/drivers/net/ath/ath5k/ath5k_desc.c (+544/-0) src/drivers/net/ath/ath5k/ath5k_dma.c (+631/-0) src/drivers/net/ath/ath5k/ath5k_eeprom.c (+1760/-0) src/drivers/net/ath/ath5k/ath5k_gpio.c (+122/-0) src/drivers/net/ath/ath5k/ath5k_initvals.c (+1560/-0) src/drivers/net/ath/ath5k/ath5k_pcu.c (+534/-0) src/drivers/net/ath/ath5k/ath5k_phy.c (+2581/-0) src/drivers/net/ath/ath5k/ath5k_qcu.c (+390/-0) src/drivers/net/ath/ath5k/ath5k_reset.c (+1174/-0) src/drivers/net/ath/ath5k/ath5k_rfkill.c (+107/-0) src/drivers/net/ath/ath5k/base.h (+145/-0) src/drivers/net/ath/ath5k/desc.h (+332/-0) src/drivers/net/ath/ath5k/eeprom.h (+451/-0) src/drivers/net/ath/ath5k/reg.h (+2589/-0) src/drivers/net/ath/ath5k/rfbuffer.h (+1181/-0) src/drivers/net/ath/ath5k/rfgain.h (+516/-0) src/drivers/net/ath/ath9k/ani.h (+168/-0) src/drivers/net/ath/ath9k/ar5008_initvals.h (+672/-0) src/drivers/net/ath/ath9k/ar9001_initvals.h (+1356/-0) src/drivers/net/ath/ath9k/ar9002_initvals.h (+3264/-0) src/drivers/net/ath/ath9k/ar9002_phy.h (+613/-0) src/drivers/net/ath/ath9k/ar9003_2p2_initvals.h (+1864/-0) src/drivers/net/ath/ath9k/ar9003_eeprom.h (+338/-0) src/drivers/net/ath/ath9k/ar9003_mac.h (+125/-0) src/drivers/net/ath/ath9k/ar9003_phy.h (+1124/-0) src/drivers/net/ath/ath9k/ar9340_initvals.h (+1525/-0) src/drivers/net/ath/ath9k/ar9485_initvals.h (+1161/-0) src/drivers/net/ath/ath9k/ath9k.c (+208/-0) src/drivers/net/ath/ath9k/ath9k.h (+521/-0) src/drivers/net/ath/ath9k/ath9k_ani.c (+733/-0) src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c (+1663/-0) src/drivers/net/ath/ath9k/ath9k_ar9002_calib.c (+997/-0) src/drivers/net/ath/ath9k/ath9k_ar9002_hw.c (+607/-0) src/drivers/net/ath/ath9k/ath9k_ar9002_mac.c (+454/-0) src/drivers/net/ath/ath9k/ath9k_ar9002_phy.c (+578/-0) src/drivers/net/ath/ath9k/ath9k_ar9003_calib.c (+932/-0) src/drivers/net/ath/ath9k/ath9k_ar9003_eeprom.c (+5005/-0) src/drivers/net/ath/ath9k/ath9k_ar9003_hw.c (+409/-0) src/drivers/net/ath/ath9k/ath9k_ar9003_mac.c (+669/-0) src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c (+1277/-0) src/drivers/net/ath/ath9k/ath9k_calib.c (+403/-0) src/drivers/net/ath/ath9k/ath9k_common.c (+69/-0) src/drivers/net/ath/ath9k/ath9k_eeprom.c (+551/-0) src/drivers/net/ath/ath9k/ath9k_eeprom_4k.c (+1078/-0) src/drivers/net/ath/ath9k/ath9k_eeprom_9287.c (+1019/-0) src/drivers/net/ath/ath9k/ath9k_eeprom_def.c (+1351/-0) src/drivers/net/ath/ath9k/ath9k_hw.c (+2067/-0) src/drivers/net/ath/ath9k/ath9k_init.c (+593/-0) src/drivers/net/ath/ath9k/ath9k_mac.c (+733/-0) src/drivers/net/ath/ath9k/ath9k_main.c (+916/-0) src/drivers/net/ath/ath9k/ath9k_recv.c (+521/-0) src/drivers/net/ath/ath9k/ath9k_xmit.c (+813/-0) src/drivers/net/ath/ath9k/calib.h (+115/-0) src/drivers/net/ath/ath9k/common.h (+56/-0) src/drivers/net/ath/ath9k/eeprom.h (+714/-0) src/drivers/net/ath/ath9k/hw-ops.h (+268/-0) src/drivers/net/ath/ath9k/hw.h (+995/-0) src/drivers/net/ath/ath9k/mac.h (+708/-0) src/drivers/net/ath/ath9k/phy.h (+51/-0) src/drivers/net/ath/ath9k/reg.h (+1919/-0) src/drivers/net/ath/ath_hw.c (+183/-0) src/drivers/net/ath/ath_key.c (+82/-0) src/drivers/net/ath/ath_main.c (+59/-0) src/drivers/net/ath/ath_regd.c (+602/-0) src/drivers/net/ath/reg.h (+64/-0) src/drivers/net/ath/regd.h (+263/-0) src/drivers/net/ath/regd_common.h (+481/-0) src/drivers/net/ath5k/ath5k.c (+0/-1698) src/drivers/net/ath5k/ath5k.h (+0/-1279) src/drivers/net/ath5k/ath5k_attach.c (+0/-340) src/drivers/net/ath5k/ath5k_caps.c (+0/-154) src/drivers/net/ath5k/ath5k_desc.c (+0/-544) src/drivers/net/ath5k/ath5k_dma.c (+0/-631) src/drivers/net/ath5k/ath5k_eeprom.c (+0/-1760) src/drivers/net/ath5k/ath5k_gpio.c (+0/-122) src/drivers/net/ath5k/ath5k_initvals.c (+0/-1560) src/drivers/net/ath5k/ath5k_pcu.c (+0/-534) src/drivers/net/ath5k/ath5k_phy.c (+0/-2581) src/drivers/net/ath5k/ath5k_qcu.c (+0/-390) src/drivers/net/ath5k/ath5k_reset.c (+0/-1174) src/drivers/net/ath5k/ath5k_rfkill.c (+0/-107) src/drivers/net/ath5k/base.h (+0/-145) src/drivers/net/ath5k/desc.h (+0/-332) src/drivers/net/ath5k/eeprom.h (+0/-451) src/drivers/net/ath5k/reg.h (+0/-2589) src/drivers/net/ath5k/rfbuffer.h (+0/-1181) src/drivers/net/ath5k/rfgain.h (+0/-516) src/drivers/net/bnx2.c (+2697/-0) src/drivers/net/bnx2.h (+4598/-0) src/drivers/net/bnx2_fw.h (+3494/-0) src/drivers/net/e1000/e1000_main.c (+1/-1) src/drivers/net/e1000e/e1000e_main.c (+1/-1) src/drivers/net/ipoib.c (+13/-8) src/drivers/net/rtl8139.c (+1/-1) src/drivers/net/vmxnet3.c (+669/-0) src/drivers/net/vmxnet3.h (+497/-0) src/hci/commands/image_cmd.c (+3/-6) src/hci/commands/time_cmd.c (+0/-40) src/image/script.c (+8/-2) src/include/assert.h (+3/-0) src/include/ipxe/asn1.h (+12/-0) src/include/ipxe/dhcp.h (+6/-3) src/include/ipxe/errfile.h (+3/-0) src/include/ipxe/list.h (+200/-10) src/include/ipxe/net80211.h (+1/-1) src/include/ipxe/pci.h (+3/-0) src/include/ipxe/tcp.h (+10/-0) src/include/ipxe/test.h (+45/-0) src/include/usr/imgmgmt.h (+0/-5) src/net/fakedhcp.c (+6/-3) src/net/fc.c (+1/-1) src/net/infiniband.c (+11/-10) src/net/netdevice.c (+23/-3) src/net/tcp.c (+4/-4) src/net/tcp/iscsi.c (+39/-12) src/net/udp/dhcp.c (+25/-23) src/tests/list_test.c (+407/-0) src/tests/test.c (+142/-0) src/usr/autoboot.c (+1/-1) src/usr/imgmgmt.c (+26/-112) src/usr/lotest.c (+89/-61) src/util/parserom.pl (+1/-1) src/util/romcheck.pl (+54/-0)
To merge this branch:	bzr merge lp://staging/~lynxman/ubuntu/precise/ipxe/newsnapshot
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
James Page	2012-01-12	Needs Fixing on 2012-01-31
Andres Rodriguez (community)		Needs Fixing on 2012-01-23
Review via email: mp+88329@code.staging.launchpad.net

Description of the change

ipxe (1.0.0+git-2.55f6c88-0ubuntu1) precise; urgency=low

  * New snapshot from upstream git repository.
  * Added rules for automatic git branch refresh.
  * Changed rom target from allbaseroms to allroms.
  * Added patch to disable bad roms.

Revision history for this message

James Page (james-page) wrote on 2012-01-20:

Hi Mark

Thanks for proposing this merge; here's some feedback

1) I might be missing something but I can't see "Added rules for automatic git branch refresh." in the changes

2) You should really import the new orig.tar.gz into the branch using "bzr merge-upstream"; that way when a sponsor branches and then does bzr bd -S all of the required data including the orig.tar.gz is present in the branch.

3) Please can you apply all patches; at the moment the branch all of them apart from the new patch applied.

Ping me on IRC if you need help with any of the above.

Cheers

James

review: Needs Fixing

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2012-01-23:

Hi Marc,

Could you please update the your branch to make it so it matches the new changes to the packaging please?

Other than that looks good. Would also be a good idea to add a debian/watch file.

Cheers.

review: Needs Fixing

Revision history for this message

Marc Cluet (lynxman) wrote on 2012-01-30:

Hi James

Fixed the branch with your suggestions, could you please review again?

Thanks

> Hi Mark
>
> Thanks for proposing this merge; here's some feedback
>
> 1) I might be missing something but I can't see "Added rules for automatic git
> branch refresh." in the changes
>
> 2) You should really import the new orig.tar.gz into the branch using "bzr
> merge-upstream"; that way when a sponsor branches and then does bzr bd -S all
> of the required data including the orig.tar.gz is present in the branch.
>
> 3) Please can you apply all patches; at the moment the branch all of them
> apart from the new patch applied.
>
> Ping me on IRC if you need help with any of the above.
>
> Cheers
>
> James

Revision history for this message

Marc Cluet (lynxman) wrote on 2012-01-30:

Hi Andres

Fixed the branch with your suggestions, could you please review again?

Thanks

> Hi Marc,
>
> Could you please update the your branch to make it so it matches the new
> changes to the packaging please?
>
> Other than that looks good. Would also be a good idea to add a debian/watch
> file.
>
> Cheers.

Revision history for this message

James Page (james-page) wrote on 2012-01-31:

Hi Mark

Thanks for updating the branch; sorry but more comments:

1) Please can you merge the two new changelog entries you have created - its all one change to the package really.

2) I tested the get-orig-source target and I got different results to the orig.tar.gz that is imported into the branch; and some error messages. The target tries to parse the version string into a date format which it then uses to generate the resulting tarball - however as the version string does not contain a valid date it fails.

It would be good to either align the versioning to what the rules are trying todo as this makes more sense.

3) This third point in really for clarity in the changelog:

* Changed rom target from allbaseroms to allroms.
* Added new target allqemu for qemu package.

Why? It would be nice to document in the changelog entry why we are building using different targets.

4) Lintian Warnings

W: ipxe source: brace-expansion-in-debhelper-config-file debian/ipxe.install
W: ipxe source: syntax-error-in-dep5-copyright paragraph 6 after the field license: THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
W: ipxe source: out-of-date-standards-version 3.9.1 (current is 3.9.2)

It would be nice to tidy these up as part of the new upstream release - specifically the first one which works by accident rather than by design and might not work in the future.

Any luck on contacting the upstream maintainer.

Cheers

James

review: Needs Fixing

Revision history for this message

Marc Cluet (lynxman) wrote on 2012-02-10:

Hi James,

No luck with the upstream maintainer, I contacted him but he wasn't open to collaboration unfortunately.

I've just refreshed the branch with all your suggestions, ready for review.

lp://staging/~lynxman/ubuntu/precise/ipxe/newsnapshot updated on 2012-02-10

9. By Marc Cluet on 2012-02-10: New upstream snapshot.
10. By Marc Cluet on 2012-02-10: * Added rules for automatic git branch refresh.
* Changed rom target from allbaseroms to allroms.
  - recommended behaviour by upstream, building all full roms is neither
    recommended nor a desired user experience
* Added new target allqemu for qemu package.
  - created new build target to build full rom drivers just for qemu
    package purposes
* Cleaned lintian errors from debian package
  - Removed brace extension in ipxe.install
  - Updated standards to 3.9.2
  - Fixed copyright file not machine readable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Marc Cluet

Ubuntu branches

Ubuntuipxe package

Merge lp://staging/~lynxman/ubuntu/precise/ipxe/newsnapshot into lp://staging/ubuntu/precise/ipxe

Commit message

Description of the change

Preview Diff

Subscribers

Ubuntu
ipxe package