Chameleon Commit Details - 1789 - Chameleon open source boot loader project.

Date:

2012-01-11 02:39:01 (12 years 3 months ago)

Author:

ErmaC

Commit:

1789

Parents:

1788

Message:

Merge trunk change Update Chameleon.xcodeproj

Changes:

M	/branches/ErmaC/Trunk/package/Scripts.templates/Pre/preinstall
M	/branches/ErmaC/Modules/Chameleon.xcodeproj/project.pbxproj
M	/branches/ErmaC/Trunk/package/buildpkg.sh
M	/branches/ErmaC/Modules/package/Scripts.templates/Pre/preinstall
M	/branches/ErmaC/Modules/package/buildpkg.sh
M	/branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj

File differences

-166
167 167
168 168
169 
170 
171 
172 
173 
169
170
171
174 172
175 173
176 174
... ...
403 401
404 402
405 403
406 
404
407 405
408 406
409 407
... ...
426 424
427 425
428 426
429 
427
430 428
431 429
432 430
... ...
441 439
442 440
443 441
444 
442
445 443
446 444
447 445
... ...
451 449
452 450
453 451
454 
452
455 453
456 454
457 455
... ...
471 469
472 470
473 471
474 
472
475 473
476 474
477 475
... ...
485 483
486 484
487 485
488 
486
489 487
490 488
491 489
... ...
494 492
495 493
496 494
497 
495
498 496
499 497
500 498
... ...
524 522
525 523
526 524
527 
525
528 526
529 527
530 528
... ...
544 542
545 543
546 544
547 
545
548 546
549 547
550 548
... ...
560 558
561 559
562 560
563 
561
564 562
565 563
566 564
... ...
588 586
589 587
590 588
591 
589
592 590
593 591
594 592
... ...
663 661
664 662
665 663
666 
664
667 665
668 666
669 667
... ...
700 698
701 699
702 700
703 
701
704 702
705 703
706 704
... ...
724 722
725 723
726 724
727 
725
728 726
729 727
730 728
... ...
738 736
739 737
740 738
741 
739
742 740
743 741
744 742
+$ownSubst"␊
␊
    for file in "$@";do␊
        if [[ ! $file == *.svn* ]]; then␊
            cp -pf "$file" "${file}.in"␊
            sed "$allSubst" "${file}.in" > "${file}"␊
            rm -f "${file}.in"␊
        fi␊
        cp -pf "$file" "${file}.in"␊
        sed "$allSubst" "${file}.in" > "${file}"␊
        rm -f "${file}.in"␊
    done␊
}␊
␊

    addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId}␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
# End build pre install package␊
␊

    ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}"␊
# End build core package␊
␊

    echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new"␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
    addChoice  --group="InstallType"  --start-selected="!choices['Upgrade'].selected"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build new install package␊
␊

    echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade"␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
    addChoice --group="InstallType"  --start-selected="chameleon_boot_plist_exists()"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build upgrade package␊
␊

    ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --group="Chameleon"  --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build standard package␊
␊

    ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --group="Chameleon"  --start-visible="systemHasGPT()" --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build efi package␊
␊

    mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --group="Chameleon"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build no bootloader choice package␊
␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build klibc package module␊
        }␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            # Add the klibc package because the uClibc module is dependent of klibc module␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"␊
            # End build uClibc package module␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build Resolution package module␊
        }␊

            ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
␊
            # Don't add a choice for Keylayout module␊
            # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"␊

            echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"␊
␊
            packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")␊
            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options"␊
            addChoice --group="${builtOptionsList}"  \␊
                --start-selected="check_chameleon_option('$key','$value')" \␊
                --pkg-refs="$packageRefId" "${optionName}"␊

        echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}"␊
␊
        packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1␊
        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options"␊
        # Add the Keylayout package because the Keylayout module is needed␊
        addChoice --group="KeyLayout"  \␊
            --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \␊

        rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"␊
␊
        packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")␊
        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1␊
        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes"␊
        addChoice --group="Themes"  --start-selected="false"  --pkg-refs="$packageRefId" "${theme}"␊
    done␊
# End build theme packages# End build Extras package␊

    cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice  --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
# End build post install package␊
␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 $ownSubst"␊
 ␊
     for file in "$@";do␊
-        if [[ ! $file == *.svn* ]]; then␊
-            cp -pf "$file" "${file}.in"␊
-            sed "$allSubst" "${file}.in" > "${file}"␊
-            rm -f "${file}.in"␊
-        fi␊
+        cp -pf "$file" "${file}.in"␊
+        sed "$allSubst" "${file}.in" > "${file}"␊
+        rm -f "${file}.in"␊
     done␊
 }␊
 ␊
     addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId}␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
 # End build pre install package␊
 ␊
     ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}"␊
 # End build core package␊
 ␊
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new"␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
     addChoice  --group="InstallType"  --start-selected="!choices['Upgrade'].selected"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build new install package␊
 ␊
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade"␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
     addChoice --group="InstallType"  --start-selected="chameleon_boot_plist_exists()"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build upgrade package␊
 ␊
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --group="Chameleon"  --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build standard package␊
 ␊
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --group="Chameleon"  --start-visible="systemHasGPT()" --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build efi package␊
 ␊
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --group="Chameleon"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build no bootloader choice package␊
 ␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build klibc package module␊
         }␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             # Add the klibc package because the uClibc module is dependent of klibc module␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"␊
             # End build uClibc package module␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build Resolution package module␊
         }␊
             ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
 ␊
             # Don't add a choice for Keylayout module␊
             # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"␊
             echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"␊
 ␊
             packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")␊
-            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options"␊
             addChoice --group="${builtOptionsList}"  \␊
                 --start-selected="check_chameleon_option('$key','$value')" \␊
                 --pkg-refs="$packageRefId" "${optionName}"␊
         echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}"␊
 ␊
         packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1␊
+        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options"␊
         # Add the Keylayout package because the Keylayout module is needed␊
         addChoice --group="KeyLayout"  \␊
             --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \␊
         rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"␊
 ␊
         packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")␊
-        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1␊
+        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes"␊
         addChoice --group="Themes"  --start-selected="false"  --pkg-refs="$packageRefId" "${theme}"␊
     done␊
 # End build theme packages# End build Extras package␊
     cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice  --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
 # End build post install package␊
 ␊

-170
171 171
172 172
173 
174 
175 
176 
177 
173
174
175
178 176
179 177
180 178
... ...
407 405
408 406
409 407
410 
408
411 409
412 410
413 411
... ...
430 428
431 429
432 430
433 
431
434 432
435 433
436 434
... ...
445 443
446 444
447 445
448 
446
449 447
450 448
451 449
... ...
455 453
456 454
457 455
458 
456
459 457
460 458
461 459
... ...
475 473
476 474
477 475
478 
476
479 477
480 478
481 479
... ...
489 487
490 488
491 489
492 
490
493 491
494 492
495 493
... ...
498 496
499 497
500 498
501 
499
502 500
503 501
504 502
... ...
532 530
533 531
534 532
535 
533
536 534
537 535
538 536
... ...
552 550
553 551
554 552
555 
553
556 554
557 555
558 556
... ...
568 566
569 567
570 568
571 
569
572 570
573 571
574 572
... ...
596 594
597 595
598 596
599 
597
600 598
601 599
602 600
... ...
614 612
615 613
616 614
617 
615
618 616
619 617
620 618
... ...
625 623
626 624
627 625
628 
626
629 627
630 628
631 629
632 630
633 
631
634 632
635 633
636 634
... ...
646 644
647 645
648 646
649 
647
650 648
651 649
652 650
... ...
662 660
663 661
664 662
665 
663
666 664
667 665
668 666
... ...
735 733
736 734
737 735
738 
736
739 737
740 738
741 739
... ...
772 770
773 771
774 772
775 
773
776 774
777 775
778 776
... ...
796 794
797 795
798 796
799 
797
800 798
801 799
802 800
... ...
810 808
811 809
812 810
813 
811
814 812
815 813
816 814
+$ownSubst"␊
␊
    for file in "$@";do␊
        if [[ ! $file == *.svn* ]]; then␊
            cp -pf "$file" "${file}.in"␊
            sed "$allSubst" "${file}.in" > "${file}"␊
            rm -f "${file}.in"␊
        fi␊
        cp -pf "$file" "${file}.in"␊
        sed "$allSubst" "${file}.in" > "${file}"␊
        rm -f "${file}.in"␊
    done␊
}␊
␊

    addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId}␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
# End build pre install package␊
␊

    ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}"␊
# End build core package␊
␊

    echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new"␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
    addChoice  --group="InstallType"  --start-selected="!choices['Upgrade'].selected"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build new install package␊
␊

    echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade"␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
    addChoice --group="InstallType"  --start-selected="chameleon_boot_plist_exists()"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build upgrade package␊
␊

    ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --group="Chameleon"  --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build standard package␊
␊

    ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --group="Chameleon"  --start-visible="systemHasGPT()" --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build efi package␊
␊

    mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice --group="Chameleon"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
    # End build no bootloader choice package␊
␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build klibc package module␊
        }␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            # Add the klibc package because the uClibc module is dependent of klibc module␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"␊
            # End build uClibc package module␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build Resolution package module␊
        }␊

            ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
␊
            # Don't add a choice for Keylayout module␊
            # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/AMDGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build AMDGraphicsEnabler package module␊
        }␊

        if [[ "${CONFIG_ATIGRAPHICSENABLER_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/ATiGraphicsEnabler.dylib" ]]; then␊
        {␊
            # Start build ATiGraphicsEnabler package module␊
            choiceId="AMDGraphicsEnabler"␊
            choiceId="ATiGraphicsEnabler"␊
            mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"␊
            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/ATiGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
            echo -e "\t[BUILD] ${choiceId} "␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build ATiGraphicsEnabler package module␊
        }␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/IntelGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
            echo -e "\t[BUILD] ${choiceId} "␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build IntelGraphicsEnabler package module␊
        }␊

            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/NVIDIAGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
            echo -e "\t[BUILD] ${choiceId} "␊
            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
            # End build NVIDIAGraphicsEnabler package module␊
        }␊

            echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"␊
␊
            packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")␊
            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1␊
            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options"␊
            addChoice --group="${builtOptionsList}"  \␊
                --start-selected="check_chameleon_option('$key','$value')" \␊
                --pkg-refs="$packageRefId" "${optionName}"␊

        echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}"␊
␊
        packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1␊
        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options"␊
        # Add the Keylayout package because the Keylayout module is needed␊
        addChoice --group="KeyLayout"  \␊
            --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \␊

        rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"␊
␊
        packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")␊
        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1␊
        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes"␊
        addChoice --group="Themes"  --start-selected="false"  --pkg-refs="$packageRefId" "${theme}"␊
    done␊
# End build theme packages# End build Extras package␊

    cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts␊
␊
    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
    addChoice  --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
# End build post install package␊
␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 $ownSubst"␊
 ␊
     for file in "$@";do␊
-        if [[ ! $file == *.svn* ]]; then␊
-            cp -pf "$file" "${file}.in"␊
-            sed "$allSubst" "${file}.in" > "${file}"␊
-            rm -f "${file}.in"␊
-        fi␊
+        cp -pf "$file" "${file}.in"␊
+        sed "$allSubst" "${file}.in" > "${file}"␊
+        rm -f "${file}.in"␊
     done␊
 }␊
 ␊
     addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" ${choiceId}␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
 # End build pre install package␊
 ␊
     ditto --noextattr --noqtn ${SYMROOT}/i386/bdmesg   ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${choiceId}"␊
 # End build core package␊
 ␊
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_new"␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
     addChoice  --group="InstallType"  --start-selected="!choices['Upgrade'].selected"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build new install package␊
 ␊
     echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/install_type_upgrade"␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
     addChoice --group="InstallType"  --start-selected="chameleon_boot_plist_exists()"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build upgrade package␊
 ␊
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --group="Chameleon"  --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build standard package␊
 ␊
     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --group="Chameleon"  --start-visible="systemHasGPT()" --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build efi package␊
 ␊
     mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice --group="Chameleon"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
     # End build no bootloader choice package␊
 ␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/${choiceId}.dylib" ${PKG_BUILD_DIR}/${choiceId}/Root␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build klibc package module␊
         }␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/uClibcxx.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             # Add the klibc package because the uClibc module is dependent of klibc module␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"␊
             # End build uClibc package module␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/Resolution.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build Resolution package module␊
         }␊
             ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp"␊
 ␊
             # Don't add a choice for Keylayout module␊
             # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/AMDGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
 ␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build AMDGraphicsEnabler package module␊
         }␊
         if [[ "${CONFIG_ATIGRAPHICSENABLER_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/ATiGraphicsEnabler.dylib" ]]; then␊
         {␊
             # Start build ATiGraphicsEnabler package module␊
-            choiceId="AMDGraphicsEnabler"␊
+            choiceId="ATiGraphicsEnabler"␊
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/ATiGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
             echo -e "\t[BUILD] ${choiceId} "␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build ATiGraphicsEnabler package module␊
         }␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/IntelGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
             echo -e "\t[BUILD] ${choiceId} "␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build IntelGraphicsEnabler package module␊
         }␊
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/NVIDIAGraphicsEnabler.dylib" "${PKG_BUILD_DIR}/${choiceId}/Root"␊
             echo -e "\t[BUILD] ${choiceId} "␊
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")␊
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/Extra/modules"␊
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"␊
             # End build NVIDIAGraphicsEnabler package module␊
         }␊
             echo "" > "${PKG_BUILD_DIR}/$optionName/Root/${keyValue}"␊
 ␊
             packageRefId=$(getPackageRefId "${packagesidentity}" "${optionName}")␊
-            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options" >/dev/null 2>&1␊
+            buildpackage "$packageRefId" "${optionName}" "${PKG_BUILD_DIR}/${optionName}" "/$chamTemp/options"␊
             addChoice --group="${builtOptionsList}"  \␊
                 --start-selected="check_chameleon_option('$key','$value')" \␊
                 --pkg-refs="$packageRefId" "${optionName}"␊
         echo "" > "${PKG_BUILD_DIR}/${choiceId}/Root/${chameleon_keylayout_key}=${availableOptions[i]}"␊
 ␊
         packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" >/dev/null 2>&1␊
+        buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options"␊
         # Add the Keylayout package because the Keylayout module is needed␊
         addChoice --group="KeyLayout"  \␊
             --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \␊
         rsync -r --exclude=.svn --exclude="*~" "${themes[$i]}/" "${PKG_BUILD_DIR}/${theme}/Root/${theme}"␊
 ␊
         packageRefId=$(getPackageRefId "${packagesidentity}" "${theme}")␊
-        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes" >/dev/null 2>&1␊
+        buildpackage "$packageRefId" "${theme}" "${PKG_BUILD_DIR}/${theme}" "/$chamTemp/Extra/Themes"␊
         addChoice --group="Themes"  --start-selected="false"  --pkg-refs="$packageRefId" "${theme}"␊
     done␊
 # End build theme packages# End build Extras package␊
     cp -f ${PKGROOT}/Scripts/Sub/UnMountEFIvolumes.sh ${PKG_BUILD_DIR}/${choiceId}/Scripts␊
 ␊
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")␊
-    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/" >/dev/null 2>&1␊
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"␊
     addChoice  --start-visible="false" --start-selected="true"  --pkg-refs="$packageRefId" "${choiceId}"␊
 # End build post install package␊
 ␊

Download the corresponding diff file