| Message ID | 1507827867-12858-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [aws-trusty] UBUNTU: SAUCE: tweak ubuntu/Makefile target order | expand |
On 12/10/17 18:04, Kamal Mostafa wrote: > Fix up the ubuntu/Makefile target placement within the '##' lines > (homogenize with master's) so that git rebase can work as intended. > > Ignore: yes > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > ubuntu/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/ubuntu/Makefile b/ubuntu/Makefile > index 3c6308f..0cbeab0 100644 > --- a/ubuntu/Makefile > +++ b/ubuntu/Makefile > @@ -39,17 +39,17 @@ endif > obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/ > ## > ## > -obj-$(CONFIG_IXGBEVF_2_14_2) += ixgbevf-2.14.2/src/ > ## > +obj-$(CONFIG_OPENNSL) += opennsl/ > ## > ## > ## > -obj-$(CONFIG_OPENNSL) += opennsl/ > ## > +obj-$(CONFIG_BNXT_BPO) += bnxt/ > ## > ## > ## > -obj-$(CONFIG_BNXT_BPO) += bnxt/ > +obj-$(CONFIG_IXGBEVF_2_14_2) += ixgbevf-2.14.2/src/ > ## > ## > ## > Seems reasonable to me. Acked-by: Colin Ian King <colin.king@canonical.com>
On 10/12/2017 07:04 PM, Kamal Mostafa wrote: > Fix up the ubuntu/Makefile target placement within the '##' lines > (homogenize with master's) so that git rebase can work as intended. > > Ignore: yes > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > ubuntu/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/ubuntu/Makefile b/ubuntu/Makefile > index 3c6308f..0cbeab0 100644 > --- a/ubuntu/Makefile > +++ b/ubuntu/Makefile > @@ -39,17 +39,17 @@ endif > obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/ > ## > ## > -obj-$(CONFIG_IXGBEVF_2_14_2) += ixgbevf-2.14.2/src/ > ## > +obj-$(CONFIG_OPENNSL) += opennsl/ > ## > ## > ## > -obj-$(CONFIG_OPENNSL) += opennsl/ > ## There are 4 ## lines here. But I see that xenial master is also 'wrong' and it shouldn't really matter. > +obj-$(CONFIG_BNXT_BPO) += bnxt/ > ## > ## > ## > -obj-$(CONFIG_BNXT_BPO) += bnxt/ > +obj-$(CONFIG_IXGBEVF_2_14_2) += ixgbevf-2.14.2/src/ > ## > ## > ## > Acked-by: Juerg Haefliger <juerg.haefliger@canonical.com>
diff --git a/ubuntu/Makefile b/ubuntu/Makefile index 3c6308f..0cbeab0 100644 --- a/ubuntu/Makefile +++ b/ubuntu/Makefile @@ -39,17 +39,17 @@ endif obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/ ## ## -obj-$(CONFIG_IXGBEVF_2_14_2) += ixgbevf-2.14.2/src/ ## +obj-$(CONFIG_OPENNSL) += opennsl/ ## ## ## -obj-$(CONFIG_OPENNSL) += opennsl/ ## +obj-$(CONFIG_BNXT_BPO) += bnxt/ ## ## ## -obj-$(CONFIG_BNXT_BPO) += bnxt/ +obj-$(CONFIG_IXGBEVF_2_14_2) += ixgbevf-2.14.2/src/ ## ## ##
Fix up the ubuntu/Makefile target placement within the '##' lines (homogenize with master's) so that git rebase can work as intended. Ignore: yes Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- ubuntu/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)