Revert to 4.13 branch and update kernel build script

CallMeFoxie · Oct 13, 2017 · 10a0efd · 10a0efd
1 parent 2eae63a
commit 10a0efd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/build-kernel.sh b/build-kernel.sh
@@ -22,7 +22,7 @@ docker run -ti \
   cp ../*.deb /base/output/ && \
   echo "===== Building Meta Package ====" && \
   KERNELVERSION=`cd /base/components/linux && make kernelversion` && \
-  PKGVERSION=`cd /base/linux-image-pine64/ && dpkg-parsechangelog -S Version` && \
-  ( [ "$KERNELVERSION" != "$PKGVERSION" ] && (echo "Updating meta package..." && cd /base/linux-image-pine64/ && ./update.sh $KERNELVERSION && dpkg-buildpackage) || (echo "No need for update" && cd /base/linux-image-pine64/ && dpkg-buildpackage)) ; \
+  cd /base/linux-image-pine64/ && \
+  ./update.sh $KERNELVERSION \
   mv /base/linux-image-pine64*.deb /base/output/ && \
   rm /base/linux-image-pine64*.changes'
diff --git a/components/linux b/components/linux
diff --git a/linux-image-pine64/update.sh b/linux-image-pine64/update.sh
@@ -2,9 +2,15 @@
 
 VERSION=$1
 
-pushd debian/
+VERSION=$1
+PKGVERSION=`dpkg-parsechangelog -S Version`
+
+if [ x"$VERSION" != x"$PKGVERSION" ]; then
+  echo "Updating meta package..."
+
+
 
-cat > /tmp/changelog.tmp << EOF
+  cat > /tmp/changelog.tmp << EOF
 linux-image-pine64 (${VERSION}) stable; urgency=medium
 
   * upgrade kernel to ${VERSION}
@@ -13,22 +19,13 @@ linux-image-pine64 (${VERSION}) stable; urgency=medium
 
 EOF
 
-mv changelog changelog_old
-cat /tmp/changelog.tmp changelog_old > changelog
-rm changelog_old
-
-#rm control || :
-cat control.in | sed "s/@VERSION@/${VERSION}/g" > control
-
-#rm linux-image-pine64.postinst
-#cat linux-image-pine64-kernel.postinst.in | sed "s/@VERSION@/${VERSION}/g" > linux-image-pine64.postinst
-
-#rm linux-image-pine64.install
-#cat linux-image-pine64-kernel.install.in | sed "s/@VERSION@/${VERSION}/g" > linux-image-pine64.install
+  mv debian/changelog debian/changelog_old
+  cat /tmp/changelog.tmp debian/changelog_old > debian/changelog
+  rm debian/changelog_old
+fi
 
-popd
+cat debian/control.in | sed "s/@VERSION@/${VERSION}/g" > debian/control
 
 dpkg-buildpackage -tc -uc -b
 
-#rm debian/linux-image-pine64.postinst debian/linux-image-pine64.install
 rm debian/control || :