Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Copyright: UnionTech Software Technology Co., Ltd.
License: CC0-1.0

# eliminate file in src/libdbm
Files: src/libdbm/libdbm.pro src/libdbm/libdbm.pri src/libdbm/vendor.pri src/libdbm/blob.qrc src/libdbm/blob_linux.qrc src/libdbm/qrc/xfbinst_x32 src/libdbm/qrc/xfbinst_x64 src/libdbm/blob/*
Files: src/libdbm/libdbm.pro src/libdbm/libdbm.pri src/libdbm/vendor.pri src/libdbm/blob.qrc src/libdbm/blob_linux.qrc src/libdbm/blob/syslinux/*
Copyright: UnionTech Software Technology Co., Ltd.
License: CC0-1.0

Expand Down
4 changes: 1 addition & 3 deletions src/app/app.pro
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,5 @@ mac* {

QMAKE_POST_LINK = macdeployqt deepin-boot-maker.app/ -libpath=/Users/deepin/Development/ci/usr/lib
}
DISTFILES += \
qrc/xfbinst_x32 \
qrc/xfbinst_x64


6 changes: 0 additions & 6 deletions src/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
#include <QIcon>
#include <QProcess>

#ifdef Q_OS_WIN32
#include <QFontDatabase>
namespace Utils {
void loadFonts();
}
#endif
#include "bmwindow.h"
#include <bminterface.h>
#include <util/utils.h>
Expand Down
Binary file removed src/app/platform/mac/Contents/Resources/7z-mac
Binary file not shown.
Binary file removed src/app/platform/mac/Contents/Resources/7z.so
Binary file not shown.
Binary file removed src/app/platform/mac/Contents/Resources/7zCon.sfx
Binary file not shown.
Binary file removed src/app/platform/mac/Contents/Resources/7za
Binary file not shown.
Binary file removed src/app/platform/mac/Contents/Resources/7zr
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/app/platform/mac/Contents/Resources/mbr.bin
Binary file not shown.
36 changes: 0 additions & 36 deletions src/app/platform/mac/Contents/Resources/mkbootable

This file was deleted.

Binary file removed src/app/platform/mac/Contents/Resources/mke2fs
Binary file not shown.
Binary file removed src/app/platform/mac/Contents/Resources/syslinux-mac
Binary file not shown.
Binary file removed src/app/platform/mac/Contents/Resources/xfbinst
Binary file not shown.
Binary file removed src/app/platform/mac/deepin-boot-maker.icns
Binary file not shown.
Binary file removed src/app/platform/windows/deepin-boot-maker.ico
Binary file not shown.
16 changes: 0 additions & 16 deletions src/app/platform/windows/deepin-boot-maker.manifest

This file was deleted.

30 changes: 0 additions & 30 deletions src/app/platform/windows/deepin-boot-maker.rc

This file was deleted.

17 changes: 1 addition & 16 deletions src/libdbm/blob.qrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
<RCC>
<qresource prefix="/">
<file>blob/syslinux/macosx/chain.c32</file>
<file>blob/syslinux/macosx/gfxboot.c32</file>
<file>blob/syslinux/macosx/menu.c32</file>
<file>blob/syslinux/macosx/vesamenu.c32</file>
<file>blob/syslinux/syslinux.cfg</file>
<file>blob/xfbinst/fb.cfg</file>
<file>blob/xfbinst/xfbinst.exe</file>
<file>blob/sevnz/sevnz.dll</file>
<file>blob/sevnz/sevnz.exe</file>
<file>blob/syslinux/win32/vesamenu.c32</file>
<file>blob/syslinux/win32/chain.c32</file>
<file>blob/syslinux/win32/gfxboot.c32</file>
<file>blob/syslinux/win32/libcom32.c32</file>
<file>blob/syslinux/win32/libutil.c32</file>
<file>blob/syslinux/win32/menu.c32</file>
<file>blob/syslinux/win32/syslinux.exe</file>
<file>blob/syslinux/syslinux.cfg</file>
</qresource>
</RCC>
Binary file removed src/libdbm/blob/syslinux/win32/chain.c32
Binary file not shown.
Binary file removed src/libdbm/blob/syslinux/win32/gfxboot.c32
Binary file not shown.
Binary file removed src/libdbm/blob/syslinux/win32/libcom32.c32
Binary file not shown.
Binary file removed src/libdbm/blob/syslinux/win32/libutil.c32
Binary file not shown.
Binary file removed src/libdbm/blob/syslinux/win32/menu.c32
Binary file not shown.
Binary file removed src/libdbm/blob/syslinux/win32/vesamenu.c32
Binary file not shown.
3 changes: 0 additions & 3 deletions src/libdbm/blob/xfbinst/fb.cfg

This file was deleted.

Binary file removed src/libdbm/blob/xfbinst/xfbinst_x32
Binary file not shown.
Binary file removed src/libdbm/blob/xfbinst/xfbinst_x64
Binary file not shown.
3 changes: 0 additions & 3 deletions src/libdbm/blob_linux.qrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<RCC>
<qresource prefix="/">
<file>blob/syslinux/syslinux.cfg</file>
<file>blob/xfbinst/fb.cfg</file>
<file>blob/xfbinst/xfbinst_x32</file>
<file>blob/xfbinst/xfbinst_x64</file>
</qresource>
</RCC>
2 changes: 0 additions & 2 deletions src/libdbm/libdbm.pro
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ linux {
isEqual(ARCH, i386) | isEqual(ARCH, x86_64){
linux {
binary.path = $${PREFIX}/bin
binary.files = $$PWD/qrc/xfbinst_x64 \
$$PWD/qrc/xfbinst_x32
INSTALLS += binary desktop hicolor
}
}
Expand Down
Binary file removed src/libdbm/qrc/xfbinst_x32
Binary file not shown.
Binary file removed src/libdbm/qrc/xfbinst_x64
Binary file not shown.
13 changes: 0 additions & 13 deletions src/libdbm/util/sevenzip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,6 @@ SevenZip::SevenZip(const QString &image, const QString &target, QObject *parent)
,m_bExit(true)
,m_sevenz(this)
{
#ifdef Q_OS_WIN32
QString sevnz = XSys::FS::InsertTmpFile(":/blob/sevnz/sevnz.exe");
QString sevnzdll = XSys::FS::InsertTmpFile(":/blob/sevnz/sevnz.dll", "7z.dll");
qDebug() << sevnz << sevnzdll;
#endif

#ifdef Q_OS_MAC
QDir resourceDir = QDir(QCoreApplication::applicationDirPath());
resourceDir.cdUp();
resourceDir.cd("Resources");
QString sevnz = resourceDir.absoluteFilePath("7z-mac");
qDebug() << sevnz;
#endif

#ifdef Q_OS_LINUX
QString sevnz = "7z";
Expand Down
129 changes: 0 additions & 129 deletions src/vendor/src/libxsys/DiskUtil/DiskUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -449,128 +449,6 @@ XSys::Result InstallSyslinux(const QString &targetDev, const QString &images)
return ret;
}

XSys::Result InstallBootloader(const QString &diskDev, const QString &images)
{
//change the partition
if (!XSys::DiskUtil::UmountDisk(diskDev)) {
return XSys::Result(XSys::Result::Failed, "", diskDev);
}

QStringList args;
args << diskDev << "-I" ;
XSys::SynExec("umount", diskDev);
XSys::SynExec("umount", diskDev);
XSys::SynExec("mkfs.fat", args.join(" "));
// pre format
QString newTargetDev = diskDev + "1";
QString xfbinstDiskName = QString("\"(hd%1)\"").arg(diskDev[diskDev.length() - 1].toLatin1() - 'a');

// fbinst: format
XSys::SynExec("umount", diskDev);
XSys::SynExec("umount", diskDev);

QString xfbinstResource = "/usr/bin/xfbinst_x32";
if (QSysInfo::buildCpuArchitecture() == "x86_64") {
xfbinstResource = "/usr/bin/xfbinst_x64";
}
QString xfbinstPath = XSys::FS::InsertTmpFile(xfbinstResource);

qDebug() << "load" << xfbinstResource << xfbinstPath;

XSys::Result ret = XSys::SynExec("chmod", " +x " + xfbinstPath);
if (!ret.isSuccess()) {
return ret;
}

ret = XSys::SynExec(xfbinstPath, QString(" %1 format --fat32 --align --force").arg(xfbinstDiskName));
if (!ret.isSuccess()) {
return ret;
}

// fbinst: install fg.cfg
QString tmpfgcfgPath = XSys::FS::InsertTmpFile(QString(":/blob/xfbinst/fb.cfg"));
XSys::SynExec("umount", diskDev);
XSys::SynExec("umount", diskDev);
ret = XSys::SynExec(xfbinstPath, QString(" %1 add-menu fb.cfg %2 ").arg(xfbinstDiskName).arg(tmpfgcfgPath));
if (!ret.isSuccess()) {
return ret;
}

// after format, diskdev change to /dev/sd?1
if (!XSys::DiskUtil::UmountDisk(diskDev)) {
return XSys::Result(XSys::Result::Failed, "", diskDev);
}

ret = XSys::SynExec("partprobe", QString(" %1").arg(diskDev));
// if (!ret.isSuccess()) { return ret; }

// rename label fix bug 20233 区分社区版专业版镜像设置U盘卷标名
ret = XSys::SynExec(XSys::FS::SearchBin("fsck"), QString("-y %1").arg(newTargetDev));
QStringList isoArgs;
isoArgs << "-i" << images << "-d";
XSys::Result ret3 = XSys::SynExec("isoinfo", isoArgs);
if (!ret3.isSuccess()) {
qWarning() << "call isoinfo failed" << ret3.result();
}
QStringList volume = ret3.result().split("\n").filter("Volume id");
QString tem = volume.takeAt(0);
if (tem.contains("Volume id: deepin", Qt::CaseInsensitive)) {
ret = XSys::SynExec(XSys::FS::SearchBin("fatlabel"), QString(" %1 DEEPINOS").arg(newTargetDev));
} else if (tem.contains("Volume id: uos", Qt::CaseInsensitive)) {
ret = XSys::SynExec(XSys::FS::SearchBin("fatlabel"), QString(" %1 UOS").arg(newTargetDev));
} else {
ret = XSys::SynExec(XSys::FS::SearchBin("fatlabel"), QString(" %1 UNKNOWN").arg(newTargetDev));
}
// install syslinux
XSys::Syslinux::InstallBootloader(newTargetDev);

// dd pbr file ldlinux.bin
QString tmpPbrPath = XSys::FS::TmpFilePath("ldlinux.bin");
ret = XSys::SynExec("dd", QString(" if=%1 of=%2 bs=512 count=1").arg(newTargetDev).arg(tmpPbrPath));
if (!ret.isSuccess()) {
return ret;
}

// fbinst: add pbr file ldlinux.bin
ret = XSys::SynExec(xfbinstPath, QString(" %1 add ldlinux.bin %2 -s").arg(xfbinstDiskName).arg(tmpPbrPath));
if (!ret.isSuccess()) {
return ret;
}

// mount
QString mountPoint = QString("/usr/bin/%1").arg(XSys::FS::TmpFilePath(""));
ret = XSys::SynExec("mkdir", QString(" -p %1").arg(mountPoint));
if (!ret.isSuccess()) {
return ret;
}

ret = XSys::SynExec("chmod", " a+wrx " + mountPoint);
if (!ret.isSuccess()) {
return ret;
}

XSys::DiskUtil::Mount(newTargetDev);

// QString mountCmd = "-o "
// "flush,rw,nosuid,nodev,shortname=mixed,"
// "dmask=0077,utf8=1,showexec %1 %2";
// the disk must be mount
// int retryTimes = 5;

// do {
// qDebug() << "Try mount the disk " << (6 - retryTimes) << " first time";
// UmountDisk(diskDev);
// QThread::sleep(5);
// XSys::SynExec("partprobe", QString(" %1").arg(diskDev));
// QThread::sleep(5);
// XSys::SynExec("mount", isoinfomountCmd.arg(newTargetDev).arg(mountPoint));
// QThread::sleep(5);
// retryTimes--;
// } while((MountPoint(newTargetDev) == "") && retryTimes);
// // how ever, if mount failed, check before install.
return XSys::Result(XSys::Result::Success, "", newTargetDev);
}

#endif


Expand Down Expand Up @@ -982,11 +860,4 @@ bool Mount(const QString &targetDev)

}

namespace Bootloader {

Result InstallBootloader(const QString &diskDev, const QString &images)
{
return XAPI::InstallBootloader(diskDev, images);
}
}
}