[xenial linux-meta-aws 1/3] UBUNTU: simplify meta package packaging

Thadeu Lima de Souza Cascardo cascardo at canonical.com
Wed Feb 1 16:45:01 UTC 2017


    git rm Makefile README
    git mv meta-source/debian .
    rmdir meta-source

BugLink: http://bugs.launchpad.net/bugs/1601954
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 Makefile                                      | 30 ---------------------------
 README                                        | 18 ----------------
 {meta-source/debian => debian}/changelog      |  0
 {meta-source/debian => debian}/compat         |  0
 {meta-source/debian => debian}/control.common |  0
 {meta-source/debian => debian}/control.d/aws  |  0
 {meta-source/debian => debian}/copyright      |  0
 {meta-source/debian => debian}/rules          |  0
 {meta-source/debian => debian}/source/options |  0
 9 files changed, 48 deletions(-)
 delete mode 100644 Makefile
 delete mode 100644 README
 rename {meta-source/debian => debian}/changelog (100%)
 rename {meta-source/debian => debian}/compat (100%)
 rename {meta-source/debian => debian}/control.common (100%)
 rename {meta-source/debian => debian}/control.d/aws (100%)
 rename {meta-source/debian => debian}/copyright (100%)
 rename {meta-source/debian => debian}/rules (100%)
 rename {meta-source/debian => debian}/source/options (100%)

diff --git a/Makefile b/Makefile
deleted file mode 100644
index fc0b59f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-LOG		:= meta-source/debian/changelog
-META_NAME	:= $(shell head -n 1 $(LOG) | sed 's/\(.*\)[[:space:]]\+(.*).*/\1/')
-META_VERSION	:= $(shell head -n 1 $(LOG) | sed 's/.*(\(.*\)).*/\1/')
-META_SERIES	:= $(shell head -n 1 $(LOG) | sed 's/.*(.*)[[:space:]]\+\(.*\);.*/\1/' | sed 's/-.*//')
-LAST_VERSION	?= $(shell rmadison -a source -s $(META_SERIES)-updates $(META_NAME) | cut -d '|' -f 2 | tr -d '[:blank:]')
-
-ifeq ($(LAST_VERSION),)
-LAST_VERSION	:= $(shell rmadison -a source -s $(META_SERIES) $(META_NAME) | cut -d '|' -f 2 | tr -d '[:blank:]')
-ifeq ($(LAST_VERSION),)
-LAST_VERSION	:= $(META_VERSION)
-endif
-endif
-
-all: source
-
-source: clean
-	ln -s meta-source $(META_NAME)-$(META_VERSION)
-	cd $(META_NAME)-$(META_VERSION); \
-	dpkg-buildpackage -S -sa -rfakeroot -I.git -I.gitignore -i'\.git.*' -v$(LAST_VERSION)
-
-binary: clean
-	ln -s meta-source $(META_NAME)-$(META_VERSION)
-	cd $(META_NAME)-$(META_VERSION); \
-	debuild -b
-
-clean:
-	cd meta-source && fakeroot debian/rules clean
-	rm -f $(META_NAME)-$(META_VERSION)
-	rm -f *.dsc *.changes *.gz *.deb *.build *.upload
-
diff --git a/README b/README
deleted file mode 100644
index bb6ccff..0000000
--- a/README
+++ /dev/null
@@ -1,18 +0,0 @@
-The toplevel makefile in this directory is used to create the upload source
-for linux-meta. By convention the directory name is supposed to be the
-name of the package with version number attached.
-In order to fullfill that convention and prevent git from being useless
-(since the renaming produces big diffs), a soft-link is created before
-calling dpkk-buildpackage.
-
-The versioning scheme in debian/changelog must be k.k.k.a.m, where
-k is the kernel version a is the ABI version and m is the version
-of the linux-meta package.
-
-You can create an upload set by calling:
-
-	make source
-
-Afterwards the temporary stuff can be removed by calling:
-
-	make clean
diff --git a/meta-source/debian/changelog b/debian/changelog
similarity index 100%
rename from meta-source/debian/changelog
rename to debian/changelog
diff --git a/meta-source/debian/compat b/debian/compat
similarity index 100%
rename from meta-source/debian/compat
rename to debian/compat
diff --git a/meta-source/debian/control.common b/debian/control.common
similarity index 100%
rename from meta-source/debian/control.common
rename to debian/control.common
diff --git a/meta-source/debian/control.d/aws b/debian/control.d/aws
similarity index 100%
rename from meta-source/debian/control.d/aws
rename to debian/control.d/aws
diff --git a/meta-source/debian/copyright b/debian/copyright
similarity index 100%
rename from meta-source/debian/copyright
rename to debian/copyright
diff --git a/meta-source/debian/rules b/debian/rules
similarity index 100%
rename from meta-source/debian/rules
rename to debian/rules
diff --git a/meta-source/debian/source/options b/debian/source/options
similarity index 100%
rename from meta-source/debian/source/options
rename to debian/source/options
-- 
2.9.3





More information about the kernel-team mailing list