diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch b/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch new file mode 100644 index 000000000..5c15218c8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch @@ -0,0 +1,64 @@ +From 02dbc7e3478e409d6f5e3e1c53daddf8838be999 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 1 Sep 2015 12:04:33 +0100 +Subject: [PATCH] Add support for deb and ipk packaging + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + functions.sh | 15 +++++++++++++++ + pkg-diff.sh | 6 ++++++ + 2 files changed, 21 insertions(+) + +diff --git a/functions.sh b/functions.sh +index 06079df..85c9003 100644 +--- a/functions.sh ++++ b/functions.sh +@@ -85,6 +85,13 @@ function unpackage() + CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories --quiet" + rpm2cpio $file | cpio ${CPIO_OPTS} + ;; ++ *.ipk|*.deb) ++ ar x $file ++ tar xf control.tar.gz ++ rm control.tar.gz ++ tar xf data.tar.gz ++ rm data.tar.gz ++ ;; + esac + popd 1>/dev/null + } +@@ -255,4 +262,12 @@ function cmp_spec () + rm $file1 $file2 + return $RES + } ++ ++function adjust_controlfile () { ++ cat $1/control | sed '/^Version: /d' > $1/control.fixed ++ mv $1/control.fixed $1/control ++ cat $2/control | sed '/^Version: /d' > $2/control.fixed ++ mv $2/control.fixed $2/control ++} ++ + # vim: tw=666 ts=2 et +diff --git a/pkg-diff.sh b/pkg-diff.sh +index 0f1fa76..3cf10aa 100644 +--- a/pkg-diff.sh ++++ b/pkg-diff.sh +@@ -138,6 +138,12 @@ echo "Extracting packages" + unpackage $oldpkg $dir/old + unpackage $newpkg $dir/new + ++case $oldpkg in ++ *.deb|*.ipk) ++ adjust_controlfile $dir/old $dir/new ++ ;; ++esac ++ + # files is set in cmp_spec for rpms, so if RES is empty we should assume + # it wasn't an rpm and pick all files for comparison. + if [ -z $RES ]; then +-- +2.1.0 + |