keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup, live: Added target use/live/no-cleanup (docs, rpmdb)

Browse Source 
It is customary to set a variable without the GLOBAL_ prefix. It
is added to the name when exporting.

I made by analogy use/cleanup/live-no-cleanup-docs.

Since both targets have long names and are needed together,
i made use/live/no-cleanup.

Use target use/live/no-cleanup should be used instead of:

@$(call set, GLOBAL_LIVE_NO_CLEANUPDB, yes)
This commit is contained in:
Anton Midyukov 2020-09-21 21:45:21 +07:00
parent 4520594a21
commit 018ea50518
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
features.in/cleanup/config.mk
View File

@ -1,9 +1,16 @@
use/cleanup:
@$(call add_feature)
@$(call xport,GLOBAL_LIVE_NO_CLEANUPDB)
@$(call xport,LIVE_NO_CLEANUPDB)
@$(call xport,LIVE_NO_CLEANUP_DOCS)
@$(call xport,CLEANUP_PACKAGES)
@$(call xport,CLEANUP_BASE_PACKAGES)
use/cleanup/live-no-cleanupdb:
@$(call set,LIVE_NO_CLEANUPDB,yes)
use/cleanup/live-no-cleanup-docs:
@$(call set,LIVE_NO_CLEANUP_DOCS,yes)
use/cleanup/libs:
@$(call add,BASE_PACKAGES,apt-scripts)
@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-libs-stage3)

4
features.in/cleanup/live/image-scripts.d/90-cleanup-docs
View File

@ -2,7 +2,9 @@
# remove all docs
# don't cripple the image to be copied over
[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
[ -n "$GLOBAL_LIVE_NO_CLEANUP_DOCS" ] || \
[ -x /usr/sbin/live-install ] || \
[ -x /usr/sbin/livecd-install ] && exit 0
rpmquery -ad |grep ^/ |xargs -r rm -f --
rm -rf /usr/share/{doc,man,info,license,gfxboot}

4
features.in/live/config.mk
View File

@ -24,6 +24,10 @@ use/live: use/stage2 sub/rootfs@live sub/stage2@live \
use/live/.base: use/live use/syslinux/ui/menu
@$(call add,LIVE_LISTS,$(call tags,base live))
use/live/no-cleanup: \
use/cleanup/live-no-cleanupdb \
use/cleanup/live-no-cleanup-docs; @:
use/live/base: use/live/.base use/net use/deflogin/live
@$(call add,LIVE_LISTS,$(call tags,base network))