Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Safa Arıman
2020-01-08 19:25:00 +03:00
parent f04dbe1dba a20ae9d217
commit c26e52a3c5
2 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/pisi/pspec.xml
-9
View File
@@ -27,16 +27,7 @@
<Dependency versionFrom="1.18">leveldb-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>initialize_filesdb_once.patch</Patch>-->
<!-- <Patch>no_clean_if_ignore_comar.patch</Patch>-->
<!-- <Patch>orphaned_pkgs.patch</Patch>-->
<!-- <Patch>improve_pisi_ix.patch</Patch>-->
<!-- <Patch>fix_emul32_flags.patch</Patch>-->
<!-- <Patch level="1">pisi-2.6-pisitools.dopixmaps-add.patch</Patch>-->
<!-- <Patch>emergeup.patch</Patch>-->
<!-- <Patch>fetch.patch</Patch>-->
<Patch>kerneltools_extra_headers_moved.patch</Patch>
<!--Patch>kernel-5.4-kerneltools-headers.patch</Patch-->
</Patches>
</Source>