Removing dependency on dos2unix and replacing build with build-arch.

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>

5 files changed, 46 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 9aab462..fecd0d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+pvr-omap4 (1.9.0.5.1.1-0ubuntu3) UNRELEASED; urgency=low
+
+  * Rename build to build-arch and make build depend on build-arch.
+  * debian/control:
+    - Removing dos2unix dependency, as it's not needed anymore with this
+      source tree
+  * debian/dkms/patches/0004-dont-need-to-run-dos2unix.patch:
+    - Removing call to dos2unix, not needed with this source tree
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Mon, 27 Aug 2012 15:50:40 -0300
+
 pvr-omap4 (1.9.0.5.1.1-0ubuntu2) quantal; urgency=low
 
   * debian/rules: mkdir ld_so_conf_dir before trying to write to it
diff --git a/debian/control b/debian/control
index f318b2b..07a6b76 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,8 @@ Vcs-Browser: http://git.linaro.org/gitweb?p=ubuntu/pvr-omap4.git
 Package: pvr-omap4
 Architecture: armhf
 Depends: dkms (>= 1.95), make, coreutils (>= 8.5), grep (>= 2.6.3),
-         dos2unix, linux-headers-omap4, xorg-video-abi-13,
-         ${misc:Depends}, ${shlibs:Depends}
+         linux-headers-omap4, xorg-video-abi-13, ${misc:Depends},
+         ${shlibs:Depends}
 Description: PowerVR SGX540 libraries for OMAP4, libs and drivers.
  PowerVR SGX540 Linux libraries for OMAP4.
  .
diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in
index b9d2fb6..04a9b26 100644
--- a/debian/dkms.conf.in
+++ b/debian/dkms.conf.in
@@ -8,3 +8,4 @@ AUTOINSTALL="yes"
 PATCH[0]="0001-core-mk-fix.patch"
 PATCH[1]="0002-km-fix-issues-w-mapping-2d-buffer.patch"
 PATCH[2]="0003-build-failure.patch"
+PATCH[3]="0004-dont-need-to-run-dos2unix.patch"
diff --git a/debian/dkms/patches/0004-dont-need-to-run-dos2unix.patch b/debian/dkms/patches/0004-dont-need-to-run-dos2unix.patch
new file mode 100644
index 0000000..4545c4e
--- /dev/null
+++ b/debian/dkms/patches/0004-dont-need-to-run-dos2unix.patch
@@ -0,0 +1,29 @@
+Description: Remove not needed call to dos2unix
+Forwarded: not-needed
+Origin: vendor
+Author: Ricardo Salveti <rsalveti@linaro.org>
+
+diff --git a/eurasiacon/build/linux2/config/core.mk b/eurasiacon/build/linux2/config/core.mk
+index aa20e6f..d42bf2b 100644
+--- a/eurasiacon/build/linux2/config/core.mk
++++ b/eurasiacon/build/linux2/config/core.mk
+@@ -589,7 +589,6 @@ endif
+ autogen:
+ ifeq ($(INTERNAL_CLOBBER_ONLY),)
+ 	@$(MAKE) -s --no-print-directory -C $(EURASIAROOT) \
+-		DOS2UNIX="$(DOS2UNIX)" \
+ 		-f eurasiacon/build/linux2/prepare_tree.mk \
+ 		LDM_PCI=$(LDM_PCI) LDM_PLATFORM=$(LDM_PLATFORM)
+ else
+diff --git a/eurasiacon/build/linux2/defs.mk b/eurasiacon/build/linux2/defs.mk
+index af9ddf6..621e03e 100644
+--- a/eurasiacon/build/linux2/defs.mk
++++ b/eurasiacon/build/linux2/defs.mk
+@@ -96,7 +96,6 @@ endef
+ define cc-check
+ $(shell \
+ 	CC_CHECK=$(patsubst @%,%,$(CC_CHECK)) && \
+-	$(patsubst @%,%,$(DOS2UNIX)) $$CC_CHECK && \
+ 	$(patsubst @%,%,$(CHMOD)) +x $$CC_CHECK && \
+ 	$$CC_CHECK --cc "$(1)" --out "$(2)" $(3))
+ endef
diff --git a/debian/rules b/debian/rules
index d355cdd..1ab2f02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,8 @@ autostartdir		:= etc/xdg/autostart
 PKG_autostartdir	:= $(PKG_configdir)
 PKG_xmoddir		:= $(PKG_libdir)/xorg/modules
 
-build:
+build: build-arch
+build-arch:
 	# Fill in important variables
 	for i in dkms.conf \
 			$(PKG_driver).dirs \
@@ -98,7 +99,7 @@ build:
 	find usr/lib -maxdepth 1 -iname "*.so*" -type f -exec chrpath -d {} +
 	chrpath -d usr/lib/xorg/modules/drivers/omap_pvr_drv.so
 
-	dh build
+	dh build-arch
 
 binary-arch:
 	dh_installdirs -p$(PKG_driver)
@@ -106,7 +107,6 @@ binary-arch:
 	dh_installdirs -p$(PKG_driver_dev)
 
 	# ld.so.conf
-	mkdir -p "$(CURDIR)/debian/$(PKG_driver)/$(ld_so_conf_dir)"
 	echo "/$(PKG_libdir)" > "$(CURDIR)/debian/$(PKG_driver)/$(ld_so_conf_path)"
 
 	# empty ld.so.conf for the fake multi-arch alternative