Skip to content

Commit

Permalink
Revert "build: don't drop 'user' flag when using the ImageBuilder"
Browse files Browse the repository at this point in the history
This reverts commit c42b915.
Now that rpcd uses the 'Auto-Installed' field to differentiate between
deliberately and implicitely installed packages we can remove the
hotfix.

Signed-off-by: Daniel Golle <[email protected]>
  • Loading branch information
dangowrt authored and Ansuel committed Feb 23, 2024
1 parent ae2dced commit 68968fc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/rootfs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ define prepare_rootfs
fi; \
done || true \
)
$(if $(IB),,awk -i inplace \
awk -i inplace \
'/^Status:/ { \
if ($$3 == "user") { $$3 = "ok" } \
else { sub(/,\<user\>|\<user\>,/, "", $$3) } \
}1' $(1)/usr/lib/opkg/status)
}1' $(1)/usr/lib/opkg/status
$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status)
@-find $(1) -name CVS -o -name .svn -o -name .git -o -name '.#*' | $(XARGS) rm -rf
rm -rf \
Expand Down

0 comments on commit 68968fc

Please sign in to comment.