From 009e861b3c36ccb1c9da420f2671c4d6cf159f25 Mon Sep 17 00:00:00 2001 From: Michal Hrusecky <Michal@Hrusecky.net> Date: Sat, 2 Feb 2019 12:21:10 +0100 Subject: [PATCH] Rebase patch --- ...pts-Don-t-skip-kernel-and-libc-in-Packages-gener.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/openwrt/to-upstream/0012-scripts-Don-t-skip-kernel-and-libc-in-Packages-gener.patch b/patches/openwrt/to-upstream/0012-scripts-Don-t-skip-kernel-and-libc-in-Packages-gener.patch index 381099ef2..d5bd5f15e 100644 --- a/patches/openwrt/to-upstream/0012-scripts-Don-t-skip-kernel-and-libc-in-Packages-gener.patch +++ b/patches/openwrt/to-upstream/0012-scripts-Don-t-skip-kernel-and-libc-in-Packages-gener.patch @@ -1,4 +1,4 @@ -From 0a362a780bdc66d9442f7aed4ed5ae439f848031 Mon Sep 17 00:00:00 2001 +From 6cf8099cfa87b43de4f2103ece7e60144147a225 Mon Sep 17 00:00:00 2001 From: Michal Hrusecky <Michal@Hrusecky.net> Date: Mon, 19 Feb 2018 21:26:48 +0100 Subject: [PATCH] scripts: Don't skip kernel and libc in Packages generation @@ -12,7 +12,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net> 1 file changed, 2 deletions(-) diff --git a/scripts/ipkg-make-index.sh b/scripts/ipkg-make-index.sh -index dcd11ca..0f198aa 100755 +index f6f15d7dd8..910e9872c3 100755 --- a/scripts/ipkg-make-index.sh +++ b/scripts/ipkg-make-index.sh @@ -14,8 +14,6 @@ for pkg in `find $pkg_dir -name '*.ipk' | sort`; do @@ -22,8 +22,8 @@ index dcd11ca..0f198aa 100755 - [[ "$name" = "kernel" ]] && continue - [[ "$name" = "libc" ]] && continue echo "Generating index for package $pkg" >&2 - file_size=$(ls -l $pkg | awk '{print $5}') + file_size=$(stat -L -c%s $pkg) sha256sum=$(mkhash sha256 $pkg) -- -2.16.1 +2.20.1 -- GitLab