Commit 30826350 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Tim Gardner

UBUNTU: [Debian] control -- prepare for new kernel-wedge semantics

We have been carrying a nastly little patch for kernel-wedge to cope with
the fact we use control.stub.  But it is simpler to just go with the flow
and emit the stub by hand.  Do this in such a way we keep a fake
debian/control.stub such that we will work with either Debian or Ubuntu
kernel-wedge.
Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
parent 4997c38d
...@@ -95,14 +95,14 @@ clean: debian/control ...@@ -95,14 +95,14 @@ clean: debian/control
rm -rf $(DEBIAN)/linux-* rm -rf $(DEBIAN)/linux-*
# This gets rid of the d-i packages in control # This gets rid of the d-i packages in control
cp -f $(DEBIAN)/control.stub $(DEBIAN)/control cp -f $(DEBIAN)/control.stub $(DROOT)/control
cp $(DEBIAN)/changelog debian/changelog cp $(DEBIAN)/changelog debian/changelog
# Install the copyright information. # Install the copyright information.
cp $(DEBIAN)/copyright debian/copyright cp $(DEBIAN)/copyright debian/copyright
distclean: clean distclean: clean
rm -rf $(DEBIAN)/control $(DEBIAN)/control.stub \ rm -rf $(DROOT)/control $(DROOT)/control.stub $(DEBIAN)/control.stub \
$(DEBIAN)/d-i/kernel-versions debian/changelog \ $(DEBIAN)/d-i/kernel-versions debian/changelog \
debian/control debian/control.stub debian/copyright debian/control debian/control.stub debian/copyright
...@@ -142,7 +142,6 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in \ ...@@ -142,7 +142,6 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in \
-e 's/=HUMAN=/$(human_arch)/g' \ -e 's/=HUMAN=/$(human_arch)/g' \
>> $(DEBIAN)/control.stub; \ >> $(DEBIAN)/control.stub; \
done done
cp $(DEBIAN)/control.stub $(DEBIAN)/control
.PHONY: debian/control .PHONY: debian/control
debian/control: $(DEBIAN)/control.stub debian/control: $(DEBIAN)/control.stub
...@@ -271,5 +270,6 @@ debian/control: $(DEBIAN)/control.stub ...@@ -271,5 +270,6 @@ debian/control: $(DEBIAN)/control.stub
$(builddir)/firmware/$(build_arch); \ $(builddir)/firmware/$(build_arch); \
fi fi
cp $(DEBIAN)/control.stub debian/control.stub echo "# placebo control.stub for kernel-wedge flow change" >debian/control.stub
cd $(builddir) && LANG=C kernel-wedge gen-control > $(CURDIR)/debian/control cp $(DEBIAN)/control.stub debian/control
cd $(builddir) && LANG=C kernel-wedge gen-control >> $(CURDIR)/debian/control
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment