github-personal/scratchpkg
1
0
Fork 0
mirror of https://github.com/outbackdingo/scratchpkg.git synced 2026-02-05 00:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
emmett1
2022-07-18 01:11:18 +08:00
parent 6626017ff7
commit 9eef7b197b
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgadd
View File

@@ -279,7 +279,7 @@ echo "$version $release" > "$ROOT_DIR/$PKGDB_DIR/$name"
cat "$TMP_PKGINSTALL" >> "$ROOT_DIR/$PKGDB_DIR/$name"
mkdir -p "$ROOT_DIR/$PKGDBPERMS_DIR"
rm -f "$ROOT_DIR/$PKGDBPERMS_DIR/$name"
grep '/$' $TMP_PKGADD | while read -r perms own junk1 junk2 junk3 dir; do
grep '/$' $TMP_PKGADD | while read -r perms own junk1 junk2 junk3 dir junk4; do
if [ "$perms" != drwxr-xr-x ] || [ "$own" != root/root ]; then
echo "$perms $own $dir" >> "$ROOT_DIR/$PKGDBPERMS_DIR/$name"
[ -s "$ROOT_DIR/$PKGDBPERMS_DIR/$name" ] || rm "$ROOT_DIR/$PKGDBPERMS_DIR/$name"

22
pkgbuild
View File

@@ -60,9 +60,6 @@ generatemdsum() {
}
pkg_checksum() {
if [ "$IGNORE_MDSUM" = "yes" ] || [ "$IGNORE_MDSUM" = 1 ]; then
return 0
fi
TMPCHECKSUM=$WORK_DIR/checksumstmp.$$
ORICHECKSUM=$WORK_DIR/checksumsori.$$
DIFCHECKSUM=$WORK_DIR/checksumsdiff.$$
@@ -70,10 +67,12 @@ pkg_checksum() {
if [ ! -f .checksums ]; then
pkg_genchecksums
else
msg "Checking checksums..."
generatemdsum > "$TMPCHECKSUM"
sort -k2 .checksums > "$ORICHECKSUM"
diff -w -t -U 0 "$ORICHECKSUM" "$TMPCHECKSUM" > "$DIFCHECKSUM"
if [ "$IGNORE_MDSUM" != "yes" ] && [ "$IGNORE_MDSUM" != 1 ]; then
msg "Checking checksums..."
generatemdsum > "$TMPCHECKSUM"
sort -k2 .checksums > "$ORICHECKSUM"
diff -w -t -U 0 "$ORICHECKSUM" "$TMPCHECKSUM" > "$DIFCHECKSUM"
fi
fi
[ -s "$DIFCHECKSUM" ] && {
@@ -328,7 +327,9 @@ pkg_package() {
cd - >/dev/null
[ -f .pkgfiles ] || pkg_genpkgfiles
if [ ! -f .pkgfiles ] || [ "$(head -n1 .pkgfiles)" != "$name-$version-$release" ]; then
pkg_genpkgfiles
fi
}
pkg_genpkgfiles() {
@@ -339,10 +340,7 @@ pkg_genpkgfiles() {
echo "$name-$version-$release" > .pkgfiles
tar -tvf "$PACKAGE_DIR/$PKGNAME" \
| awk '{$3=$4=$5=""; print $0}' \
| sed "s,lib/modules/$(uname -r),lib/modules/<kernelversion>,g" \
| sort -k 3 >> .pkgfiles
tar -tvf "$PACKAGE_DIR/$PKGNAME" | sort -k 3 >> .pkgfiles
msg "Pkgfiles updated."
}