Skip to content

Commit

Permalink
Merge pull request #848 from klihub/fixes/build/supported-distro-dete…
Browse files Browse the repository at this point in the history
…ction

build: fix supported distro detection.
  • Loading branch information
marquiz committed Jun 21, 2022
2 parents e40b9b1 + 971c719 commit 3218c69
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -183,15 +183,15 @@ DOCKER_SITE_CMD := $(DOCKER) run --rm -v "`pwd`:/docs" --user=`id -u`:`id -g` \

# Supported distros with debian native packaging format.
SUPPORTED_DEB_DISTROS := $(shell \
grep -l 'apt-get ' dockerfiles/cross-build/Dockerfile.* | \
grep -l 'apt-get ' dockerfiles/cross-build/Dockerfile.*.in | \
egrep -v '((~)|(swp))$$' | \
sed 's:^.*Dockerfile.::g')
sed 's:^.*Dockerfile.::g;s:.in$$::g')

# Supported distros with rpm native packaging format.
SUPPORTED_RPM_DISTROS := $(shell \
egrep -l '(dnf )|(yum )|(zypper )' dockerfiles/cross-build/Dockerfile.* | \
egrep -l '(dnf )|(yum )|(zypper )' dockerfiles/cross-build/Dockerfile.*.in | \
egrep -v '((~)|(swp))$$' | \
sed 's:^.*Dockerfile.::g')
sed 's:^.*Dockerfile.::g;s:.in$$::g')

# Directory to leave built distro packages and collateral in.
PACKAGES_DIR := packages
Expand Down

0 comments on commit 3218c69

Please sign in to comment.