Changeset 1e977a4 in freewrt

Timestamp:

Jul 16, 2006, 8:39:14 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

8c028e7

Parents:

efcdba6

Message:

switch to paxmirabilis

ok wbx@

NB: not yet totally tested, but if anything breaks I'll fix it today/tonight

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@228 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• Makefile (modified) (1 diff)
• rules.mk (modified) (3 diffs)
• scripts/scan-tools.sh (modified) (1 diff)
• target/linux/image/tgz.mk (modified) (1 diff)
• tools/Makefile (modified) (2 diffs)

Makefile

@@ -107 +107 @@
                 ln -s $$(which make) lbin/gmake; \
         fi
-        @if which gtar >/dev/null 2>&1; then \
-                ln -s $$(which gtar) lbin/tar; \
-        else \
-                ln -s $$(which tar) lbin/tar; \
-        fi
         @if ! which md5sum >/dev/null 2>&1; then \
                 cp scripts/md5sum.bsd lbin/md5sum; \

rules.mk

@@ +1 @@
+# $FreeWRT$
+
 include $(TOPDIR)/lbin/prereq.mk
 include $(TOPDIR)/.config
@@ -54 +56 @@
 
 ifeq ($(BR2_TAR_VERBOSITY),y)
-TAR_OPTIONS=-xvf
+TAR_OPTIONS=    -xvf
 else
-TAR_OPTIONS=-xf
+TAR_OPTIONS=    -xf
 endif
-
-#ifeq ($(shell which pax 2>/dev/null),)
-TAR_EXTRACT=    $(TOPDIR)/lbin/tar $(TAR_OPTIONS) -
-#else
-#TAR_EXTRACT=   pax -r -pma
-#endif
+TAR_EXTRACT=    ${TOPDIR}/lbin/tar ${TAR_OPTIONS} -
 
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
@@ -139 +136 @@
                 for file in ${DISTFILES}; do \
                         case $$file in \
-                        *.zip)  unzip $$file ;; \
-                        *.cpio) cpio -mid <$$file ;; \
-                        *.tar)  tar -xf $$file ;; \
-                        *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \
+                        *.cpio | *.tar) \
+                                cpio -mid <$$file ;; \
+                        *.cpio.Z | *.cpio.gz | *.cgz | *.mcz | \
+                            *.tar.Z | *.tar.gz | *.taz | *.tgz) \
                                 gzip -dc $$file | cpio -mid ;; \
-                        *.tar.Z | *.tar.gz | *.taz | *.tgz) \
-                                gzip -dc $$file | tar -xf - ;; \
-                        *.cpio.bz2 | *.cbz) \
+                        *.cpio.bz2 | *.cbz | *.tar.bz2 | *.tbz) \
                                 bzip2 -dc $$file | cpio -mid ;; \
-                        *.tar.bz2 | *.tbz) \
-                                bzip2 -dc $$file | tar -xf - ;; \
+                        *.zip) \
+                                unzip $$file ;; \
                         esac; \
                 done

scripts/scan-tools.sh

@@ -181 +181 @@
 fi
 
-if ! tar --version 2>&1 | fgrep 'GNU tar' >/dev/null 2>&1; then
-        echo You must install GNU tar for now, sorry...
-        echo this is horrid, I know, but it will be fixed RSN.
-        exit 1
-fi
-
 #if ! which perl >/dev/null 2>&1; then
 if [[ "$(which perl 2>/dev/null)" != /usr/bin/perl ]]; then

target/linux/image/tgz.mk

@@ -1 +1 @@
 $(KDIR)/root.tar.gz:
-        tar --owner=0 --group=0 -czf $@ -C $(KDIR)/root/ .
+        tar -M uidgid -cf - -C $(KDIR)/root/ . | gzip -n9 >$@
 
 ifeq ($(BOARD),x86)

tools/Makefile

@@ -6 +6 @@
 BUILD_SED_DEP:=sed-install
 
-TARGETS:=$(BUILD_SED) ipkg-utils brcm-utils lzma
+TARGETS:=paxmirabilis $(BUILD_SED) ipkg-utils brcm-utils lzma
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
@@ -12 +12 @@
 
 all: install
-install: $(TARGETS_INSTALL)
+install: check-pax $(TARGETS_INSTALL)
 clean: $(TARGETS_CLEAN)
+
+check-pax:
+        @[ -e ${TOPDIR}/lbin/pax ] || \
+            rm -f $(TOOLS_STAMP_DIR)/.tools_paxmirabilis-install
 
 $(STAGING_DIR):