Changeset 450 for main/linuxmuster-linbo/trunk/debian/rules

Timestamp:

02/16/09 19:09:38 (3 years ago)

Author:

tschmitt

Message:

• trunk mit testing zusammengeführt
• NIC-Treiber jetzt modular, werden mit hwinfo ausgelesen und gezielt geladen
• Staging-Treiber für Agere ET1310 GB Netzwerkkarte aktiviert

File:

• main/linuxmuster-linbo/trunk/debian/rules (modified) (8 diffs)

main/linuxmuster-linbo/trunk/debian/rules

@@ -11 +11 @@
 
 # kernel
-#  VESAMODE=771 # 800x600, 256 colors
-VESAMODE=0 # VGA16
+VESAMODE=771 # 800x600, 256 colors
+# VESAMODE=0 # VGA16
 # VESAMODE=791 # 1024x768, 64k colors # Currently not working
 KERNEL_ARCHIVE=$(shell grep linux- debian/md5sums.src | awk '{ print $$2 }')
-KVERS=$(shell echo $(KERNEL_ARCHIVE) | awk -F\- '{ print $$2 }' | sed -e 's/.tar.bz2//')
+KVERS=$(shell echo $(KERNEL_ARCHIVE) | sed -e 's/linux-//' | sed -e 's/.tar.bz2//')
 KERNEL_DIR=kernel/linux-$(KVERS)
-KERNEL_URL=http://www.kernel.org/pub/linux/kernel/v2.6
+KERNEL_URL=http://www.kernel.org/pub/linux/kernel/v2.6/testing
 
 # cloop
@@ -53 +53 @@
 MSSYS_ARCHIVE=$(shell grep ms-sys- debian/md5sums.src | awk '{ print $$2 }')
 MSSYS_DIR=src/$(shell echo $(MSSYS_ARCHIVE) | sed -e 's/.tgz//')
-MSSYS_URL=http://prdownloads.sourceforge.net/ms-sys
+MSSYS_URL=$(LML_URL)
 
 # ntfs-3g
@@ -63 +63 @@
 NTFSPROGS_ARCHIVE=$(shell grep ntfsprogs- debian/md5sums.src | awk '{ print $$2 }')
 NTFSPROGS_DIR=src/$(shell echo $(NTFSPROGS_ARCHIVE) | sed -e 's/.tar.bz2//')
-NTFSPROGS_URL=http://prdownloads.sourceforge.net/linux-ntfs
+NTFSPROGS_URL=$(LML_URL)
 
 #rsync
@@ -75 +75 @@
 SSMTP_URL=http://archive.ubuntu.com/ubuntu/pool/universe/s/ssmtp
 
-#pci.ids
-PCIIDS=http://pciids.sourceforge.net/v2.2/pci.ids.gz
+#hwinfo
+HWINFO_ARCHIVE=$(shell grep hwinfo_ debian/md5sums.src | awk '{ print $$2 }')
+HWINFO_DIR=src/$(shell echo $(HWINFO_ARCHIVE) | sed -e 's/.orig.tar.gz//' | sed -e 's/_/-/' )
+HWINFO_VER=$(shell echo $(HWINFO_ARCHIVE) | sed -e 's/.orig.tar.gz//' | sed -e 's/hwinfo_//' )
+HWINFO_URL=http://archive.ubuntu.com/ubuntu/pool/universe/h/hwinfo
 
 configure: configure-stamp
@@ -176 +179 @@
         fi
 
+        # hwinfo
+        -@if [ ! -d $(HWINFO_DIR) ]; then \
+                ( [ -e cache/$(HWINFO_ARCHIVE) ] || ( cd cache && wget $(HWINFO_URL)/$(HWINFO_ARCHIVE) ) ); \
+                ( cd cache && grep $(HWINFO_ARCHIVE) ../debian/md5sums.src | md5sum -c ); \
+                echo "[1mUnpacking $(HWINFO_ARCHIVE)...[0m" ; \
+                tar xf cache/$(HWINFO_ARCHIVE) -C src; \
+                echo "[1mPatching hwinfo sources...[0m" ; \
+                ( cd $(HWINFO_DIR) && for i in ../../patches/hwinfo/*; do patch -p1 <$$i; done ); \
+                ln -sf ../$(HWINFO_DIR) src/hwinfo; \
+        fi
+
         # qt
         -@if [ ! -d $(QT_DIR) ]; then \
@@ -195 +209 @@
                 #( cd $(CLOOP_DIR) && for i in ../../patches/cloop/*; do patch -p1 <$$i; done ); \
                 ln -sf ../$(CLOOP_DIR) kernel/cloop; \
-        fi
-
-        # pci.ids
-        wget $(PCIIDS) -O cache/pci.ids.gz
-        ( [ -e cache/pci.ids.gz ] && gzip -c cache/pci.ids.gz > src/pci.ids )
-        rm cache/pci.ids.gz
 
         # kernel
@@ -273 +281 @@
                 echo "[1mBuilding ssmtp...[0m" ; \
                 ( cd $(SSMTP_DIR) && ./configure --exec-prefix="/usr" --prefix="" --enable-static --with-cflags="-O2 -g -Wall" && make && strip ssmtp ); \
+        fi
+
+        # hwinfo
+        -@if [ ! -e $(HWINFO_DIR)/hwinfo ]; then \
+                echo "[1mBuilding hwinfo...[0m" ; \
+                ( cd $(HWINFO_DIR) && make && strip hwinfo src/libhd.so.$(HWINFO_VER) ); \
         fi
 
@@ -353 +367 @@
         echo >> ../initramfs.conf ; \
         echo "# modules" >> ../initramfs.conf ; \
-        ( cd ../modules && find . -type d -printf "dir %p %m 0 0\n" && find . -type f \( -path \*/ide/\* -o -path \*/ata/\* -o -path \*/net/\* -o -path \*/usb/\* -o -path \*/fs/\* -o -path \*/block/\* -o -name cloop.ko -o -name modules.\* \) -printf "file %p .../modules%p %m 0 0\n" ) | sed -e 's|\./|/|g' >>$(CURDIR)/kernel/initramfs.conf ; \
+        ( cd ../modules && find . -type d -printf "dir %p %m 0 0\n" && find . -type f \( -path \*/ide/\* -o -path \*/ata/\* -o -path \*/net/\* -o -path \*/usb/\* -o -path \*/fs/\* -o -path \*/net/\* -o -path \*/staging/\* -o -path \*/block/\* -o -name cloop.ko -o -name modules.\* \) -printf "file %p .../modules%p %m 0 0\n" ) | sed -e 's|\./|/|g' >>$(CURDIR)/kernel/initramfs.conf ; \
         echo >> ../initramfs.conf ; \
         echo "# busybox applets" >> ../initramfs.conf ; \