Subversion Repository

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

Parent Directory | Revision Log | View Patch Patch

-revision 27,
Sun Oct  4 17:28:56 2009 UTC
+revision 31,
Tue Oct  6 11:01:39 2009 UTC
 Line 2
  # Makefile for CRUX PPC, based on Makefile for CRUX
  # Copyright (c) 2003-2004 Per Liden <per@fukt.bth.se>
  # Copyright (c) 2004 Giulivo Navigante <giulivo@linuxmail.org>
- # Copyright (c) 2005-2008 The CRUX PPC Team - http://cruxppc.sunsite.dk
+ # Copyright (c) 2005-2009 The CRUX PPC Team - http://cruxppc.sunsite.dk
  #
- # $Id: 14/01/2008 05:02:13 acrux *0.10* $
+ # CRUX PPC
- # CRUX PPC 2.4
+ # 32bit Release
- # release codename is: _Mafarka _le _futuriste
+ # release codename is: maggio 2009
  #
+ CRUXPPCVERSION    = 2.5
  COLLECTIONS       = core opt xorg
  KERNEL_MIRROR     = ftp://ftp.eu.kernel.org
- KERNEL_VERSION    = 2.6.27.6
+ KERNEL_VERSION    = 2.6.29.4
- KERNEL_PATCHES    = cruxppc-logo.diff
+ KERNEL_PATCHES    = cruxppc-logo.diff linux-2.6.29.4.patch
  FAKE_ROOT_DIR     = $(PWD)/tmp/fake_root
  ISO_ROOT_DIR      = $(PWD)/tmp/iso_root
- ISO_FILENAME      = $(PWD)/crux-ppc-2.5.iso
+ SRCISO_ROOT_DIR   = $(PWD)/tmp/srciso_root
- ISO_PACKAGES      = filesystem bash coreutils bzip2 e2fsprogs jfsutils xfsprogs \
+ ISO_FILENAME      = $(PWD)/crux-ppc-$(CRUXPPCVERSION).iso
-                     reiserfsprogs patch findutils glibc grep gzip kbd module-init-tools \
+ SRCISO_FILENAME   = $(PWD)/crux-ppc-$(CRUXPPCVERSION)-source.iso
-                     less yaboot gawk ncurses net-tools pkgutils procps readline sed shadow \
+ ISO_PACKAGES      = filesystem bash coreutils bzip2 e2fsprogs jfsutils \
-                     mktemp sysklogd sysvinit tar util-linux-ng vim which dialog nano mdadm \
+                     xfsprogs reiserfsprogs patch findutils glibc grep gzip \
-                     parted mac-fdisk hfsutils nvsetenv yaboot glib mc \
+                     kbd module-init-tools less gawk ncurses net-tools \
-                     pciutils libusb usbutils sysfsutils udev iproute2 memtester zlib
+                     pkgutils procps readline sed shadow sysklogd sysvinit \
+                     tar util-linux-ng vim which dialog nano mdadm parted \
- PORTS_core        = $(shell /bin/ls -I README ports/core)
+                     mac-fdisk hfsutils nvsetenv yaboot glib mc pciutils \
- PORTS_opt         = yaboot run-parts pbbuttonsd parted nvsetenv ncftp memtester mac-fdisk \
+                     libusb usbutils sysfsutils udev iproute2 memtester \
-                   rp-pppoe elinks eject b43-fwcutter nano dialog mdadm wireless-tools \
+                     zlib libpcre libgmp mkimage
-                   libpng glib mc glitz libjpeg hicolor-icon-theme atk wpa_supplicant \
+ PORTS_core        = $(shell /bin/ls -I README -I libstdc++-compat64 ports/core)
-                   freetype cairo libtiff fontconfig pango gtk libidl firefox \
+ PORTS_opt         = expat xulrunner yaboot run-parts pbbuttonsd parted nvsetenv \
-                   cdrkit sudo imlib2 fluxbox fetchmail procmail \
+                     ncftp mac-fdisk rp-pppoe elinks eject \
-                   libxml2 libxslt libdrm mutt xterm p5-xml-parser \
+                     nano dialog mdadm b43-fwcutter wireless-tools wpa_supplicant \
-                   python sqlite3 nspr dbus nss dbus-glib xulrunner parthenope \
+                     libpng glib mc glitz libjpeg hicolor-icon-theme atk \
-                   intltool libungif libattr libcap cmake
+                     freetype cairo libtiff fontconfig pango \
+                     gtk libidl firefox cdrkit imlib2 fluxbox fetchmail \
+                     procmail libxml2 libxslt libdrm mutt xterm p5-xml-parser \
+                     python sqlite3 nspr dbus nss dbus-glib intltool libungif \
+                     libattr libcap cmake parthenope mkimage alsa-lib fakeroot \
+                     lvm2
  PORTS_xorg        = $(shell /bin/ls -I README ports/xorg)
  ifeq ($(FORCE),yes)
  PKGMK_FORCE=-f
  else
-Line 54 
 help:
+Line 59 
 help:
          @echo "Collections:"
          @echo "  $(COLLECTIONS)"
- pull:
+ #pull:
-         @for i in $(COLLECTIONS); do echo Updating $$i; (cd ports/$$i; git pull git://cruxppc.crux.it/srv/git/ports/$$i.git 2.5); done
+ #       @for i in $(COLLECTIONS); do echo Updating $$i; (cd ports/$$i; git pull git://cruxppc.crux.it/cruxppc/git/ports/$$i.git $(CRUXPPCVERSION)); done
  check-root:
          @if [ "$$UID" != "0" ]; then \
-Line 64 
 check-root:
+Line 69 
 check-root:
          fi
  check-log:
-         @grep "^=======> ERROR:"; \
+         @grep "> ERROR:"; \
          if [ "$$?" = "0" ]; then \
                  echo "(see log file for details)"; \
                  exit 1; \
-Line 80 
 kernel/linux-$(KERNEL_VERSION): kernel/l
+Line 85 
 kernel/linux-$(KERNEL_VERSION): kernel/l
          for FILE in $(KERNEL_PATCHES); do \
                  cd kernel/linux-$(KERNEL_VERSION) && patch -p1 < ../$$FILE && cd ../..; \
          done
-         cp -a kernel/linux-$(KERNEL_VERSION) kernel/linux-$(KERNEL_VERSION)-64bit
          cp -a kernel/linux-$(KERNEL_VERSION) kernel/linux-$(KERNEL_VERSION)-Sam440ep
          cp -a kernel/linux-$(KERNEL_VERSION) kernel/linux-$(KERNEL_VERSION)-Efika
+         patch -p1 -d kernel/linux-$(KERNEL_VERSION)-Efika < kernel/linux-$(KERNEL_VERSION)-Efika.patch
          cp -a kernel/linux-$(KERNEL_VERSION) kernel/linux-$(KERNEL_VERSION)-Pegasos2
          patch -p1 -d kernel/linux-$(KERNEL_VERSION)-Pegasos2 < kernel/linux-$(KERNEL_VERSION)-Pegasos2.patch
          cp -a kernel/linux-$(KERNEL_VERSION) kernel/linux-$(KERNEL_VERSION)-Chrp32
-Line 91 
 kernel/linux-$(KERNEL_VERSION)/vmlinux:
+Line 96 
 kernel/linux-$(KERNEL_VERSION)/vmlinux:
          make -C kernel/linux-$(KERNEL_VERSION) mrproper
          cp -f kernel/linux-$(KERNEL_VERSION).config kernel/linux-$(KERNEL_VERSION)/.config
          make -C kernel/linux-$(KERNEL_VERSION) oldconfig
-         make -j16 -C kernel/linux-$(KERNEL_VERSION) all
+         make -j8 -C kernel/linux-$(KERNEL_VERSION) all
          touch kernel/linux-$(KERNEL_VERSION)/arch/powerpc/boot/zImage.pmac
-         make -C kernel/linux-$(KERNEL_VERSION)-64bit mrproper
-         cp -f kernel/linux-$(KERNEL_VERSION)-64bit.config kernel/linux-$(KERNEL_VERSION)-64bit/.config
-         make -C kernel/linux-$(KERNEL_VERSION)-64bit oldconfig
-         make -j16 -C kernel/linux-$(KERNEL_VERSION)-64bit all
-         touch kernel/linux-$(KERNEL_VERSION)-64bit/vmlinux
          make -C kernel/linux-$(KERNEL_VERSION)-Sam440ep mrproper
          cp -f kernel/linux-$(KERNEL_VERSION)-Sam440ep.config kernel/linux-$(KERNEL_VERSION)-Sam440ep/.config
          make -C kernel/linux-$(KERNEL_VERSION)-Sam440ep oldconfig
-         make -j16 -C kernel/linux-$(KERNEL_VERSION)-Sam440ep all
+         make -j8 -C kernel/linux-$(KERNEL_VERSION)-Sam440ep all
-         touch kernel/linux-$(KERNEL_VERSION)-Sam440ep/vmlinux
+         touch kernel/linux-$(KERNEL_VERSION)-Sam440ep/arch/powerpc/boot/cuImage.sam440ep
          make -C kernel/linux-$(KERNEL_VERSION)-Efika mrproper
          cp -f kernel/linux-$(KERNEL_VERSION)-Efika.config kernel/linux-$(KERNEL_VERSION)-Efika/.config
          make -C kernel/linux-$(KERNEL_VERSION)-Efika oldconfig
-         make -j16 -C kernel/linux-$(KERNEL_VERSION)-Efika all
+         make -j8 -C kernel/linux-$(KERNEL_VERSION)-Efika all
          touch kernel/linux-$(KERNEL_VERSION)-Efika/arch/powerpc/boot/zImage.chrp
          make -C kernel/linux-$(KERNEL_VERSION)-Pegasos2 mrproper
          cp -f kernel/linux-$(KERNEL_VERSION)-Pegasos2.config kernel/linux-$(KERNEL_VERSION)-Pegasos2/.config
          make -C kernel/linux-$(KERNEL_VERSION)-Pegasos2 oldconfig
-         make -j16 -C kernel/linux-$(KERNEL_VERSION)-Pegasos2 all
+         make -j8 -C kernel/linux-$(KERNEL_VERSION)-Pegasos2 all
          touch kernel/linux-$(KERNEL_VERSION)-Pegasos2/arch/powerpc/boot/zImage.chrp
          make -C kernel/linux-$(KERNEL_VERSION)-Chrp32 mrproper
          cp -f kernel/linux-$(KERNEL_VERSION)-Chrp32.config kernel/linux-$(KERNEL_VERSION)-Chrp32/.config
          make -C kernel/linux-$(KERNEL_VERSION)-Chrp32 oldconfig
-         make -j16 -C kernel/linux-$(KERNEL_VERSION)-Chrp32 all
+         make -j8 -C kernel/linux-$(KERNEL_VERSION)-Chrp32 all
          touch kernel/linux-$(KERNEL_VERSION)-Chrp32/vmlinux
  kernel: kernel/linux-$(KERNEL_VERSION)/vmlinux
  kernel-clean:
          if [ -e kernel/linux-$(KERNEL_VERSION) ]; then rm -rf kernel/linux-$(KERNEL_VERSION); fi
-         if [ -e kernel/linux-$(KERNEL_VERSION)-64bit ]; then rm -rf kernel/linux-$(KERNEL_VERSION)-64bit; fi
          if [ -e kernel/linux-$(KERNEL_VERSION)-Sam440ep ]; then rm -rf kernel/linux-$(KERNEL_VERSION)-Sam440ep; fi
          if [ -e kernel/linux-$(KERNEL_VERSION)-Efika ]; then rm -rf kernel/linux-$(KERNEL_VERSION)-Efika; fi
          if [ -e kernel/linux-$(KERNEL_VERSION)-Pegasos2 ]; then rm -rf kernel/linux-$(KERNEL_VERSION)-Pegasos2; fi
-Line 138 
 clean: kernel-clean
+Line 136 
 clean: kernel-clean
  $(COLLECTIONS): check-root
          @for p in $(PORTS_$(@)); do \
                  echo "p: $$p"; \
-                 (cd ports/$@/$$p && if [ -e pre-install ]; then sh pre-install; fi; pkgmk -d $(PKGMK_FORCE)); \
+                 (cd ports/$@/$$p; pkgmk -d $(PKGMK_FORCE)); \
          done
  all: $(COLLECTIONS)
-Line 155 
 all-chroot: check-root
+Line 153 
 all-chroot: check-root
          @echo "Installing packages"
          @mkdir -p $(FAKE_ROOT_DIR)/var/lib/pkg
          @touch $(FAKE_ROOT_DIR)/var/lib/pkg/db
-         @for COLL in $(COLLECTIONS); do \
+         @#for COLL in $(COLLECTIONS); do \
-                 for PACKAGE in ports/$$COLL/*/*.pkg.tar.gz; do \
+         #       for PACKAGE in ports/$$COLL/*/*.pkg.tar.gz; do \
-                         echo " $$PACKAGE"; \
+         #               echo " $$PACKAGE"; \
-                         pkgadd -r $(FAKE_ROOT_DIR) $$PACKAGE; \
+         #               pkgadd -r $(FAKE_ROOT_DIR) $$PACKAGE; \
-                 done; \
+         #       done; \
+         #done
+         @for p in $(PORTS_core); do \
+                 echo " $$p"; \
+                 pkgadd -r $(FAKE_ROOT_DIR) ports/core/$$p/$$p*.pkg.tar.gz; \
+         done
+         @for p in $(PORTS_opt); do \
+                 echo " $$p"; \
+                 pkgadd -r $(FAKE_ROOT_DIR) ports/opt/$$p/$$p*.pkg.tar.gz; \
+         done
+         @for p in $(PORTS_xorg); do \
+                 echo " $$p"; \
+                 pkgadd -r $(FAKE_ROOT_DIR) ports/xorg/$$p/$$p*.pkg.tar.gz; \
          done
          @echo "Mounting /dev on $(FAKE_ROOT_DIR)/dev"
          @mount --bind /dev $(FAKE_ROOT_DIR)/dev
-Line 185 
 all-chroot: check-root
+Line 195 
 all-chroot: check-root
  bootstrap: check-root
          @echo "Bootstrap started    (`date +'%F %T'`)"
          @echo "- Stage 0            (`date +'%F %T'`)"
-         @find ports/ -name ".footprint" -exec rm {} \;
+         @for i in $(PORTS_core) $(PORTS_opt) $(PORTS_xorg); do\
+                 rm -f ports/*/$$i/.footprint.powerpc;\
+         done
          @$(MAKE) all &> log.stage0
          @$(MAKE) check-log < log.stage0
          @echo "- Stage 1            (`date +'%F %T'`)"
-         @find ports/ -name ".footprint" -exec rm {} \;
+         @for i in $(PORTS_core) $(PORTS_opt) $(PORTS_xorg); do\
+                 rm -f ports/*/$$i/.footprint.powerpc;\
+         done
          @$(MAKE) all-chroot &> log.stage1
          @$(MAKE) check-log < log.stage1
          @echo "- Stage 2            (`date +'%F %T'`)"
-Line 205 
 releasenotes:
+Line 219 
 releasenotes:
          @if [ -e doc/releasenotes.txt ]; then rm -f doc/releasenotes.txt; fi
          @(cd doc; ../scripts/get_wiki_release_notes)
- iso: check-root
+ iso: check-root handbook releasenotes dependencies-check
-         #handbook releasenotes dependencies-check
-         @#kernel
          @echo "Creating ISO image ($(ISO_FILENAME))"
          @if [ -e $(ISO_ROOT_DIR) ]; then rm -rf $(ISO_ROOT_DIR); fi
          @mkdir -p $(ISO_ROOT_DIR)
-Line 216 
 iso: check-root
+Line 228 
 iso: check-root
                  tar -C $(ISO_ROOT_DIR) -xzpf ports/*/$$PACKAGE/$$PACKAGE\#*.pkg.tar.gz; \
          done
          @echo "- Copying ISO specific files"
-         @mkdir -p $(ISO_ROOT_DIR)/etc $(ISO_ROOT_DIR)/ppc/{chrp,efika,mac,pegasos2,ppc32,ppc64,sam440ep}
+         @mkdir -p $(ISO_ROOT_DIR)/etc $(ISO_ROOT_DIR)/ppc/{chrp,efika,mac,pegasos2,ppc32,sam440ep}
          @cp iso/ppc/bootinfo.txt $(ISO_ROOT_DIR)/ppc
-         @cp iso/ppc/chrp/yaboot $(ISO_ROOT_DIR)/ppc/chrp
+         @cp iso/ppc/chrp/{yaboot.chrp,yaboot.msg} $(ISO_ROOT_DIR)/ppc/chrp
          @cp iso/ppc/mac/{ofboot.b,yaboot} $(ISO_ROOT_DIR)/ppc/mac
-         @cp iso/ppc/ppc32/yaboot.conf $(ISO_ROOT_DIR)/ppc/ppc32
+         @cp iso/ppc/ppc32/{yaboot.conf,yaboot.msg} $(ISO_ROOT_DIR)/ppc/ppc32
-         @cp iso/ppc/ppc64/yaboot.conf $(ISO_ROOT_DIR)/ppc/ppc64
          @cp iso/ppc/sam440ep/{Parthenope,menu.lst} $(ISO_ROOT_DIR)/ppc/sam440ep
          @cp iso/ppc/sam440ep/menu.lst $(ISO_ROOT_DIR)
          @cp iso/etc/{fstab,hosts,inittab,issue,motd,ld.so.conf,protocols,rc,rc.shutdown,rc.single,services,yaboot.conf} $(ISO_ROOT_DIR)/etc
          @echo "- Installing kernel"
          @cp kernel/linux-$(KERNEL_VERSION)/System.map $(ISO_ROOT_DIR)/ppc/ppc32
-         @cp kernel/linux-$(KERNEL_VERSION)/vmlinux $(ISO_ROOT_DIR)/ppc/ppc32
+         @cp kernel/linux-$(KERNEL_VERSION)/arch/powerpc/boot/zImage.pmac $(ISO_ROOT_DIR)/ppc/ppc32
-         @cp kernel/linux-$(KERNEL_VERSION)-64bit/System.map $(ISO_ROOT_DIR)/ppc/ppc64
-         @cp kernel/linux-$(KERNEL_VERSION)-64bit/vmlinux $(ISO_ROOT_DIR)/ppc/ppc64
-         @cp kernel/linux-$(KERNEL_VERSION)-64bit/arch/powerpc/boot/zImage $(ISO_ROOT_DIR)/ppc/ppc64
          @cp kernel/linux-$(KERNEL_VERSION)-Sam440ep/System.map $(ISO_ROOT_DIR)/ppc/sam440ep
          @cp kernel/linux-$(KERNEL_VERSION)-Sam440ep/arch/powerpc/boot/cuImage.sam440ep $(ISO_ROOT_DIR)/ppc/sam440ep/uImage
          @cp kernel/linux-$(KERNEL_VERSION)-Efika/System.map $(ISO_ROOT_DIR)/ppc/efika
          @cp kernel/linux-$(KERNEL_VERSION)-Efika/arch/powerpc/boot/zImage.chrp $(ISO_ROOT_DIR)/ppc/efika
          @cp kernel/linux-$(KERNEL_VERSION)-Pegasos2/System.map $(ISO_ROOT_DIR)/ppc/pegasos2
          @cp kernel/linux-$(KERNEL_VERSION)-Pegasos2/arch/powerpc/boot/zImage.chrp $(ISO_ROOT_DIR)/ppc/pegasos2
-         @cp kernel/linux-$(KERNEL_VERSION)-Chrp32/System.map $(ISO_ROOT_DIR)/ppc/chrp/System.map
+         @cp kernel/linux-$(KERNEL_VERSION)-Chrp32/System.map $(ISO_ROOT_DIR)/ppc/chrp
          @cp kernel/linux-$(KERNEL_VERSION)-Chrp32/vmlinux $(ISO_ROOT_DIR)/ppc/chrp
-         @#cp kernel/linux-$(KERNEL_VERSION)-Apple64/System.map $(ISO_ROOT_DIR)/ppc/ppc64
-         @#cp kernel/linux-$(KERNEL_VERSION)-Apple64/vmlinux $(ISO_ROOT_DIR)/ppc/ppc64
-         @#@cp kernel/linux-$(KERNEL_VERSION)-pSeries/System.map $(ISO_ROOT_DIR)/boot/System.map-pSeries
-         @#@cp kernel/linux-$(KERNEL_VERSION)-pSeries/vmlinux $(ISO_ROOT_DIR)/boot/vmlinux-pSeries
          @echo "- Installing kernel modules (see modules_install.log)"
          @make -C kernel/linux-$(KERNEL_VERSION) INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log
-         @make -C kernel/linux-$(KERNEL_VERSION)-64bit INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log-64bit
          @make -C kernel/linux-$(KERNEL_VERSION)-Sam440ep INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log-Sam440ep
          @make -C kernel/linux-$(KERNEL_VERSION)-Efika INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log-Efika
          @make -C kernel/linux-$(KERNEL_VERSION)-Pegasos2 INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log-Pegasos2
          @make -C kernel/linux-$(KERNEL_VERSION)-Chrp32 INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log-Chrp32
-         @#make -C kernel/linux-$(KERNEL_VERSION)-Apple64 INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log-Apple64
-         @#@make -C kernel/linux-$(KERNEL_VERSION)-pSeries INSTALL_MOD_PATH=$(ISO_ROOT_DIR) modules_install &> modules_install.log-pSeries
          @echo "- Deleting superfluous files"
          @cd $(ISO_ROOT_DIR) &&           rm -rf var opt home
          @cd $(ISO_ROOT_DIR)/usr &&       rm -rf man include lib/*.a lib/*.o lib/gconv lib/locale src
-Line 264 
 iso: check-root
+Line 265 
 iso: check-root
          @cd $(ISO_ROOT_DIR)/lib/modules/$(KERNEL_VERSION) && rm -f build
          @echo "- Creating symlinks"
          @ln -sf /tmp/var $(ISO_ROOT_DIR)/var
          @ln -sf /proc/mounts $(ISO_ROOT_DIR)/etc/mtab
          @echo "- Updating library links and cache"
          @ldconfig -r $(ISO_ROOT_DIR)
          @echo "- Copying CRUX PPC packages"
-Line 277 
 iso: check-root
+Line 278 
 iso: check-root
          @mkdir -p $(ISO_ROOT_DIR)/crux/kernel
          @cp kernel/linux-$(KERNEL_VERSION).tar.bz2 $(ISO_ROOT_DIR)/crux/kernel
          @cp kernel/linux-$(KERNEL_VERSION).config $(ISO_ROOT_DIR)/crux/kernel
-         @cp kernel/linux-$(KERNEL_VERSION)-64bit.config $(ISO_ROOT_DIR)/crux/kernel
          @cp kernel/linux-$(KERNEL_VERSION)-Sam440ep.config $(ISO_ROOT_DIR)/crux/kernel
          @cp kernel/linux-$(KERNEL_VERSION)-Efika.config $(ISO_ROOT_DIR)/crux/kernel
+         @cp kernel/linux-$(KERNEL_VERSION)-Efika.patch $(ISO_ROOT_DIR)/crux/kernel
          @cp kernel/linux-$(KERNEL_VERSION)-Pegasos2.config $(ISO_ROOT_DIR)/crux/kernel
          @cp kernel/linux-$(KERNEL_VERSION)-Pegasos2.patch $(ISO_ROOT_DIR)/crux/kernel
          @cp kernel/linux-$(KERNEL_VERSION)-Chrp32.config $(ISO_ROOT_DIR)/crux/kernel
-         @#cp kernel/linux-$(KERNEL_VERSION)-Apple64.config $(ISO_ROOT_DIR)/crux/kernel
-         @#@cp kernel/linux-$(KERNEL_VERSION)-pSeries.config $(ISO_ROOT_DIR)/crux/kernel
          @for FILE in $(KERNEL_PATCHES); do \
                  cp kernel/$$FILE $(ISO_ROOT_DIR)/crux/kernel; \
          done
-         @for COLL in $(COLLECTIONS); do \
+         @mkdir -p $(ISO_ROOT_DIR)/crux/core
-                 mkdir -p $(ISO_ROOT_DIR)/crux/$$COLL; \
+         @for PKG in $(PORTS_core); do \
-                 cp ports/$$COLL/*/*.pkg.tar.gz $(ISO_ROOT_DIR)/crux/$$COLL; \
+                 cp ports/core/$$PKG/*.pkg.tar.gz $(ISO_ROOT_DIR)/crux/core; \
-                 (cd ports/$$COLL; \
+         done
-                  for i in `find -name "pre-install"`; do \
+         @mkdir -p $(ISO_ROOT_DIR)/crux/opt
-                         cp $$i $(ISO_ROOT_DIR)/crux/$$COLL/`echo $$i | sed -e 's|\.\/||' -e 's|\/|\.|g'`; \
+         @for PKG in $(PORTS_opt); do \
-                  done; \
+                 cp ports/opt/$$PKG/*.pkg.tar.gz $(ISO_ROOT_DIR)/crux/opt; \
-                  for i in `find -name "post-install"`; do \
+         done
-                         cp $$i $(ISO_ROOT_DIR)/crux/$$COLL/`echo $$i | sed -e 's|\.\/||' -e 's|\/|\.|g'`; \
+         @mkdir -p $(ISO_ROOT_DIR)/crux/xorg
-                  done; \
+         @for PKG in $(PORTS_xorg); do \
-                 ); \
+                 cp ports/xorg/$$PKG/*.pkg.tar.gz $(ISO_ROOT_DIR)/crux/xorg; \
          done
          @echo "- Starting mkisofs"
          @if [ -f $(ISO_FILENAME) ]; then rm -f $(ISO_FILENAME); fi
-         @mkisofs -r -V CRUX-PPC -U -chrp-boot -hfs -part -probe -no-desktop \
+         @genisoimage -r -V CRUX-PPC -U -chrp-boot -hfs -part -probe -no-desktop \
                  -hfs-bless $(ISO_ROOT_DIR)/ppc/mac -map iso/boot/map.hfs \
                  -b ppc/sam440ep/Parthenope -no-emul-boot \
                  -hide-rr-moved -o $(ISO_FILENAME) $(ISO_ROOT_DIR)
-Line 314 
 dependencies-check:
+Line 313 
 dependencies-check:
          @if [ -e iso/setup.dependencies ]; then rm iso/setup.dependencies; fi
          @make iso/setup.dependencies
          @for i in `cat iso/setup.dependencies | sed -e 's|[^:]*:\ ||' -e 's|\ |\n|g' | sort | uniq`; do \
-                 prt-get search $$i > /dev/null ; \
+                 ilenia -s $$i > /dev/null ; \
                  if [ "$$?" != "0" ]; then \
                          echo "Missing dependence $$i" ;\
                          exit 1 ;\
                  fi ; \
          done
-Line 324 
 dependencies-check:
+Line 323 
 dependencies-check:
  iso/setup.dependencies:
          @for PORT in $(foreach c,$(COLLECTIONS),$(PORTS_$(c))); do \
                  echo -n $$PORT": "; \
-                 prt-get quickdep $$PORT; \
+                 ilenia -D $$PORT | awk '{ print $$1 }' | xargs; \
          done > $@
+ source-iso:
+         @echo "Creating ISO image with sources ($(SRCISO_FILENAME))"
+         @rm -rf $(SRCISO_ROOT_DIR)
+         @mkdir -p $(SRCISO_ROOT_DIR)/{ports,kernel,misc}
+         @echo "- Copying ports"
+         @for PORT in $(PORTS_core) $(PORTS_opt) $(PORTS_xorg); do \
+                 find ports -mindepth 2 -maxdepth 2 -name $$PORT -type d -exec cp -r {} $(SRCISO_ROOT_DIR)/ports \; ; \
+                 rm -f $(SRCISO_ROOT_DIR)/ports/$$PORT/{*~,build.log,.footprint,.md5sum,*.pkg.tar.gz}; \
+         done
+         @echo "- Copying kernel and patches"
+         @cp kernel/linux-$(KERNEL_VERSION).tar.bz2  $(SRCISO_ROOT_DIR)/kernel
+         @for PATCH in $(KERNEL_PATCHES); do cp kernel/$$PATCH $(SRCISO_ROOT_DIR)/kernel; done
+         @echo "- Creating README"
+         @echo "- Starting genisoimage"
+         @genisoimage -R -l -J -V CRUX-PPC-$(CRUXVERSION) -A "CRUX PPC" -o $(SRCISO_FILENAME) $(SRCISO_ROOT_DIR)
+         @md5sum `basename $(SRCISO_FILENAME)` > `basename $(SRCISO_FILENAME) .iso`.md5
  # End of file

 Legend:



Removed from v.27
 


changed lines


 
Added in v.31
 Legend:



Removed from v.27
 


changed lines


 
Added in v.31
-Removed from v.27
+Added in v.31

	ViewVC Help
Powered by ViewVC 1.1.2

CRUX PPC

A lightweight GNU/Linux distribution for PowerPC!

Subversion Repository