code_public/logcorrelator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename RPM directories to generic el8/el9/el10 naming

Browse Source 
- Replace rocky8/rocky9/almalinux10 with el8/el9/el10
- Rename Docker build stages: rpm-rocky* → rpm-el*
- Update Makefile to use new directory structure
- Update comments: 'Rocky Linux' → 'Enterprise Linux'
- Simplify Docker volume mount path for RPM output

This makes the naming more generic and aligned with RPM conventions
(el8, el9, el10) rather than specific distribution names.

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
Jacquin Antoine
2026-03-01 00:29:50 +01:00
parent b25dc24ed9
commit 644d81d33e
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -52,22 +52,22 @@ package: package-rpm
## package-rpm: Build RPM packages for Rocky Linux 8/9, AlmaLinux 10 (requires Docker)
package-rpm:
mkdir -p $(DIST_DIR)/rpm/rocky8 $(DIST_DIR)/rpm/rocky9 $(DIST_DIR)/rpm/almalinux10
mkdir -p $(DIST_DIR)/rpm/el8 $(DIST_DIR)/rpm/el9 $(DIST_DIR)/rpm/el10
$(DOCKER_BUILD) --target output -t $(PACKAGER_IMAGE) \
--build-arg VERSION=$(PKG_VERSION) \
-f Dockerfile.package .
@echo "Extracting RPM packages from Docker image..."
$(DOCKER_RUN) --rm -v $(PWD)/$(DIST_DIR):/output $(PACKAGER_IMAGE) sh -c \
"cp -r /packages/rpm/rocky8 /output/rpm/ && \
cp -r /packages/rpm/rocky9 /output/rpm/ && \
cp -r /packages/rpm/almalinux10 /output/rpm/"
$(DOCKER_RUN) --rm -v $(PWD)/$(DIST_DIR)/rpm:/output/rpm $(PACKAGER_IMAGE) sh -c \
"cp -r /packages/rpm/el8 /output/rpm/ && \
cp -r /packages/rpm/el9 /output/rpm/ && \
cp -r /packages/rpm/el10 /output/rpm/"
@echo "RPM packages created:"
@echo " Rocky Linux 8:"
ls -la $(DIST_DIR)/rpm/rocky8/ 2>/dev/null || echo " (no packages)"
@echo " Rocky Linux 9:"
ls -la $(DIST_DIR)/rpm/rocky9/ 2>/dev/null || echo " (no packages)"
@echo " AlmaLinux 10:"
ls -la $(DIST_DIR)/rpm/almalinux10/ 2>/dev/null || echo " (no packages)"
@echo " Enterprise Linux 8 (el8):"
ls -la $(DIST_DIR)/rpm/el8/ 2>/dev/null || echo " (no packages)"
@echo " Enterprise Linux 9 (el9):"
ls -la $(DIST_DIR)/rpm/el9/ 2>/dev/null || echo " (no packages)"
@echo " Enterprise Linux 10 (el10):"
ls -la $(DIST_DIR)/rpm/el10/ 2>/dev/null || echo " (no packages)"
## test-package-rpm: Test RPM package installation in Docker
test-package-rpm: package-rpm