janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 13:03:58 +01:00
Code Activity

linux-rpm-*.mk: Fix pax_global_header

Browse source 
Fix pax_global_header, which is breaking kernel version detection for
too old tar executables.
This commit is contained in:
Jan Lindemann 2006-01-09 01:23:12 +00:00 • committed by Jan Lindemann
commit eed3b76604
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/linux-rpm-build.mk
View file

@ -23,11 +23,11 @@ KERNEL_PKG_BASE = /home/samba/dat/share/exe/linux/os/$(KERNEL_MAJOR).$(KERN
ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).*),)
ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),)
KERNEL_PKG = $(KERNEL_PKG_BASE).gz KERNEL_PKG = $(KERNEL_PKG_BASE).gz
KERNEL_SRC_DIR = $(shell tar -tzf $(KERNEL_DIR)/$(KERNEL_PKG) | head -1) KERNEL_SRC_DIR = $(shell tar -tzf $(KERNEL_DIR)/$(KERNEL_PKG) | grep -v pax_global_header | head -1)
endif endif
ifneq ($(wildcard $(KERNEL_PKG_BASE).bz2),) ifneq ($(wildcard $(KERNEL_PKG_BASE).bz2),)
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2
KERNEL_SRC_DIR = $(shell tar -tjf $(KERNEL_DIR)/$(KERNEL_PKG) | head -1) KERNEL_SRC_DIR = $(shell tar -tjf $(KERNEL_DIR)/$(KERNEL_PKG) | grep -v pax_global_header | head -1)
endif endif
else else
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2

4
make/linux-rpm.mk
View file

@ -14,11 +14,11 @@ KERNEL_PKG_BASE = /home/samba/dat/share/exe/linux/os/$(KERNEL_MAJOR).$(KERN
ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).*),)
ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),)
KERNEL_PKG = $(KERNEL_PKG_BASE).gz KERNEL_PKG = $(KERNEL_PKG_BASE).gz
KERNEL_SRC_DIR = $(shell tar -tzf $(KERNEL_DIR)/$(KERNEL_PKG) | head -1) KERNEL_SRC_DIR = $(shell tar -tzf $(KERNEL_DIR)/$(KERNEL_PKG) | grep -v pax_global_header | head -1)
endif endif
ifneq ($(wildcard $(KERNEL_PKG_BASE).bz2),) ifneq ($(wildcard $(KERNEL_PKG_BASE).bz2),)
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2
KERNEL_SRC_DIR = $(shell tar -tjf $(KERNEL_DIR)/$(KERNEL_PKG) | head -1) KERNEL_SRC_DIR = $(shell tar -tjf $(KERNEL_DIR)/$(KERNEL_PKG) | grep -v pax_global_header | head -1)
endif endif
else else
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2