Changeset 0769839


Ignore:
Timestamp:
12/10/13 08:43:41 (20 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
a51ecee, 4f9718b
Parents:
4808ce64 (diff), 48087a03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/00_header

    r4a9e407 rcee7463  
    3030. "${datarootdir}/grub/grub-mkconfig_lib" 
    3131 
     32# Set indicator that we haven't written device access yet 
     33haveDevAccess=0 
     34 
    3235# Do this as early as possible, since other commands might depend on it. 
    3336# (e.g. the `loadfont' command might need lvm or raid modules) 
     
    135138    if [ -n "$GRUB_FONT" ] ; then 
    136139       # Make the font accessible 
    137        prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT}"` 
     140       if [ $haveDevAccess -ne 1 ] ; then 
     141                haveDevAccess=1 
     142                prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT}"` 
     143       fi 
    138144    cat << EOF 
    139145if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then 
     
    158164EOF 
    159165                # Make the font accessible 
    160                 prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"` 
     166                if [ $haveDevAccess -ne 1 ] ; then 
     167                        haveDevAccess=1 
     168                        prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"` 
     169                fi 
    161170    cat << EOF 
    162171    font="`make_system_path_relative_to_its_root "${font_path}"`" 
     
    219228        gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&2 
    220229 
    221         prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` 
     230        if [ $haveDevAccess -ne 1 ] ; then 
     231                haveDevAccess=1 
     232                prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` 
     233        fi 
    222234        cat << EOF 
    223235insmod gfxmenu 
     
    260272            *)             gettext "Unsupported image format" >&2; echo >&2; exit 1 ;; 
    261273        esac 
    262         prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` 
     274        if [ $haveDevAccess -ne 1 ] ; then 
     275                haveDevAccess=1 
     276                prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` 
     277        fi 
    263278        cat << EOF 
    264279insmod $reader 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_ktrueos

    r4a9e407 rcee7463  
    170170      cat > /tmp/.grubdataset.$$.1 << EOF 
    171171    insmod zfs 
    172     search -s -l $ztank 
     172    search --no-floppy -s -l $ztank 
    173173EOF 
    174174 
  • src-qt4/EasyPBI-devel/Makefile

    r69ec30c r4808ce64  
    11############################################################################# 
    22# Makefile for building: EasyPBI 
    3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Dec 10 10:59:18 2013 
     3# Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Dec 10 11:34:10 2013 
    44# Project:  EasyPBI.pro 
    55# Template: app 
     
    5757                moc_preferencesDialog.cpp \ 
    5858                moc_aboutDialog.cpp \ 
    59                 moc_PBIModule.cpp \ 
    6059                qrc_EasyPBI.cpp 
    6160OBJECTS       = main.o \ 
     
    7372                moc_preferencesDialog.o \ 
    7473                moc_aboutDialog.o \ 
    75                 moc_PBIModule.o \ 
    7674                qrc_EasyPBI.o 
    7775DIST          = /usr/local/share/qt4/mkspecs/common/unix.conf \ 
     
    215213mocables: compiler_moc_header_make_all compiler_moc_source_make_all 
    216214 
    217 compiler_moc_header_make_all: moc_mainGUI.cpp moc_newModuleDialog.cpp moc_preferencesDialog.cpp moc_aboutDialog.cpp moc_PBIModule.cpp 
     215compiler_moc_header_make_all: moc_mainGUI.cpp moc_newModuleDialog.cpp moc_preferencesDialog.cpp moc_aboutDialog.cpp 
    218216compiler_moc_header_clean: 
    219         -$(DEL_FILE) moc_mainGUI.cpp moc_newModuleDialog.cpp moc_preferencesDialog.cpp moc_aboutDialog.cpp moc_PBIModule.cpp 
     217        -$(DEL_FILE) moc_mainGUI.cpp moc_newModuleDialog.cpp moc_preferencesDialog.cpp moc_aboutDialog.cpp 
    220218moc_mainGUI.cpp: modBuild.h \ 
    221219                backend.h \ 
     
    238236                aboutDialog.h 
    239237        /usr/local/bin/moc-qt4 $(DEFINES) $(INCPATH) aboutDialog.h -o moc_aboutDialog.cpp 
    240  
    241 moc_PBIModule.cpp: PBIModule.h 
    242         /usr/local/bin/moc-qt4 $(DEFINES) $(INCPATH) PBIModule.h -o moc_PBIModule.cpp 
    243238 
    244239compiler_rcc_make_all: qrc_EasyPBI.cpp 
     
    350345        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_aboutDialog.o moc_aboutDialog.cpp 
    351346 
    352 moc_PBIModule.o: moc_PBIModule.cpp  
    353         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_PBIModule.o moc_PBIModule.cpp 
    354  
    355347qrc_EasyPBI.o: qrc_EasyPBI.cpp  
    356348        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_EasyPBI.o qrc_EasyPBI.cpp 
  • src-qt4/EasyPBI-devel/PBIModule.cpp

    r69ec30c r4808ce64  
    537537//  EXTERNAL-LINKS 
    538538// ============= 
     539void PBIModule::loadExternalLinks( QStringList& bin, QStringList& link, QStringList& type){ 
     540  //Empty the output variables 
     541  bin.clear(); 
     542  link.clear(); 
     543  type.clear(); 
     544  //Read the file and parse the contents 
     545  QStringList contents = readFile(basePath+"/external-links"); 
     546  for(int i=0; i<contents.length(); i++){ 
     547    contents[i] = contents[i].replace("\t"," ").simplified(); 
     548    if(!contents[i].startsWith("#") && !contents[i].isEmpty()){ 
     549      bin << contents[i].section(" ",0,0,QString::SectionSkipEmpty); 
     550      link <<  contents[i].section(" ",1,1,QString::SectionSkipEmpty); 
     551      type <<  contents[i].section(" ",2,2,QString::SectionSkipEmpty); 
     552    } 
     553  } 
     554 
     555} 
     556 
     557bool PBIModule::saveExternalLinks( QStringList bin, QStringList link, QStringList type){ 
     558  if( (bin.length() != link.length()) || (bin.length() != type.length()) ){ 
     559    qDebug() << "Error: Unequal external-links list lengths"; 
     560    return false; 
     561  } 
     562  //Create the file contents 
     563  QStringList contents; 
     564  contents << "# Files to be Sym-Linked into the default LOCALBASE"; 
     565  contents << "# One per-line, relative to %%PBI_APPDIR%% and LOCALBASE"; 
     566  contents << "# Defaults to keeping any existing files in LOCALBASE"; 
     567  contents << "# Use action \"binary\" for binaries that need wrapper functionality\n"; 
     568  contents << "# TARGET             LINK IN LOCALBASE         ACTION"; 
     569  for(int i=0; i<bin.length(); i++){ 
     570    contents << bin[i] + " \t " + link[i] + " \t " + type[i]; 
     571  } 
     572  //Now save the contents to file 
     573  return createFile(basePath+"/external-links", contents); 
     574   
     575} 
    539576 
    540577// =============== 
  • src-qt4/EasyPBI-devel/PBIModule.h

    r69ec30c r4808ce64  
    8383         
    8484        //External Links 
     85        void loadExternalLinks( QStringList& bin, QStringList& link, QStringList& type); 
     86        bool saveExternalLinks( QStringList bin, QStringList link, QStringList type); 
    8587 
    8688        //General Utilities 
     
    9799        QString basePath, version; 
    98100 
    99 signals: 
    100  
    101101}; 
    102102 
Note: See TracChangeset for help on using the changeset viewer.