Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for including man pages in the main SFS #3127

Merged
merged 3 commits into from
Jul 3, 2022
Merged

Add support for including man pages in the main SFS #3127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04c8aa4
add support for including man pages in the main SFS
dimkr May 31, 2022
410520a
Merge branch 'testing' of https://github.com/puppylinux-woof-CE/woof-…
dimkr Jul 3, 2022
5d3da3e
add INCLUDE_MAN_PAGES=yes in bookworm64
dimkr Jul 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions woof-code/2createpackages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,15 @@ do
cp -a --remove-destination ${ONEDIR}/* ${DOC_DIR}/${ONEDIR}/
rm -rf ${ONEDIR}
fi
if [ "$INCLUDE_MAN_PAGES" = "yes" -a -z "$EXE" ]; then
case "$ONEDIR" in
*"/man")
mkdir -p ${ONEDIR}
cp -av --remove-destination ${DOC_DIR}/${ONEDIR}/man[1-9]* ${ONEDIR}
rm -rf ${DOC_DIR}/${ONEDIR}/man[1-9]*
;;
esac
fi
continue
;;
#-- DEV -- development
Expand Down
4 changes: 4 additions & 0 deletions woof-code/support/bdrv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ fi
mkdir -p bdrv_NLS/usr/share bdrv_DOC/usr/share
mv bdrv/usr/share/locale bdrv_NLS/usr/share/
mv bdrv/usr/share/doc bdrv/usr/share/info bdrv/usr/share/man bdrv_DOC/usr/share/
if [ "$INCLUDE_MAN_PAGES" = "yes" ]; then
mkdir -p bdrv/usr/share/man
mv -v bdrv_DOC/usr/share/man/man[1-9]* bdrv/usr/share/man/
fi
if [ -d bdrv/usr/share/gnome/help ]; then
mkdir -p bdrv_DOC/usr/share/gnome
mv bdrv/usr/share/gnome/help bdrv_DOC/usr/share/gnome/
Expand Down
7 changes: 5 additions & 2 deletions woof-code/support/petbuilds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,6 @@ for NAME in $PETBUILDS; do
rm -f ../petbuild-output/${NAME}-${HASH}/etc/ld.so.cache
rm -f ../petbuild-output/${NAME}-${HASH}/root/.wget-hsts

rm -rf ../petbuild-output/${NAME}-${HASH}/usr/share/man
rm -rf ../petbuild-output/${NAME}-${HASH}/usr/share/info
rm -f ../petbuild-output/${NAME}-${HASH}/usr/share/icons/hicolor/icon-theme.cache
rm -rf ../petbuild-output/${NAME}-${HASH}/usr/lib/python*
rm -rf ../petbuild-output/${NAME}-${HASH}/lib/pkgconfig
Expand Down Expand Up @@ -321,6 +319,11 @@ for NAME in $PKGS; do
mv ../packages-${DISTRO_FILE_PREFIX}/${NAME}/usr/share/${DOCDIR} ../packages-${DISTRO_FILE_PREFIX}/${NAME}_DOC/usr/share/
done

if [ "$INCLUDE_MAN_PAGES" = "yes" -a -d ../packages-${DISTRO_FILE_PREFIX}/${NAME}_DOC/usr/share/man ]; then
mkdir ../packages-${DISTRO_FILE_PREFIX}/${NAME}/usr/share/man
mv -v ../packages-${DISTRO_FILE_PREFIX}/${NAME}_DOC/usr/share/man/man[1-9]* ../packages-${DISTRO_FILE_PREFIX}/${NAME}/usr/share/man/
fi

for SUFFIX in _DOC _NLS; do
[ ! -d ../packages-${DISTRO_FILE_PREFIX}/${NAME}${SUFFIX} ] && continue
sed -e "s/^${NAME}/${NAME}${SUFFIX}/" -e "s/|${NAME}/|${NAME}${SUFFIX}/g" ../packages-${DISTRO_FILE_PREFIX}/${NAME}/pet.specs > ../packages-${DISTRO_FILE_PREFIX}/${NAME}${SUFFIX}/pet.specs
Expand Down
3 changes: 3 additions & 0 deletions woof-distro/x86_64/debian/bullseye64/_00build.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ PTHEME="412"
## include Pkg in build (y/n). If commented then asked in 3builddistro
INCLUDE_PKG=n

## include man pages in main SFS?
INCLUDE_MAN_PAGES=yes

## ucode.cpio initial ram disk with CPU bugfixes
## build the microcode initrd to mitigate aganst cpu bugs like spectre/meltdown
## You can specify 'amd' or 'intel' as args to latest_microcode.sh
Expand Down
3 changes: 3 additions & 0 deletions woof-distro/x86_64/debian/sid64/_00build.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ PTHEME="412"
## include Pkg in build (y/n). If commented then asked in 3builddistro
INCLUDE_PKG=n

## include man pages in main SFS?
INCLUDE_MAN_PAGES=yes

## ucode.cpio initial ram disk with CPU bugfixes
## build the microcode initrd to mitigate aganst cpu bugs like spectre/meltdown
## You can specify 'amd' or 'intel' as args to latest_microcode.sh
Expand Down
3 changes: 3 additions & 0 deletions woof-distro/x86_64/ubuntu/jammy64/_00build.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ PTHEME="Tahrpup"
## include Pkg in build (y/n). If commented then asked in 3builddistro
INCLUDE_PKG=n

## include man pages in main SFS?
INCLUDE_MAN_PAGES=yes

## ucode.cpio initial ram disk with CPU bugfixes
## build the microcode initrd to mitigate aganst cpu bugs like spectre/meltdown
## You can specify 'amd' or 'intel' as args to latest_microcode.sh
Expand Down